aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc45
1 files changed, 45 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
new file mode 100644
index 000000000000..d321230278d7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
@@ -0,0 +1,45 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2016-05-11 19:02:17 UTC
++++ chrome/browser/ui/webui/options/browser_options_handler.cc
+@@ -491,13 +491,13 @@ void BrowserOptionsHandler::GetLocalized
+ { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
+ #endif // defined(OS_CHROMEOS)
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+ { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
+ { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
+ { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
+ #else
+ { "themes", IDS_THEMES_GROUP_NAME },
+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif // defined(OS_POSIX) && !defined(OS_CHROMEOS)
+
+ #if defined(OS_CHROMEOS) && defined(USE_ASH)
+ { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
+@@ -738,7 +738,7 @@ void BrowserOptionsHandler::RegisterMess
+ "requestProfilesInfo",
+ base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
+ base::Unretained(this)));
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+ web_ui()->RegisterMessageCallback(
+ "themesSetNative",
+ base::Bind(&BrowserOptionsHandler::ThemesSetNative,
+@@ -1366,7 +1366,7 @@ void BrowserOptionsHandler::ObserveTheme
+ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
+ bool is_system_theme = false;
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+ bool profile_is_supervised = profile->IsSupervised();
+ is_system_theme = theme_service->UsingSystemTheme();
+ base::FundamentalValue native_theme_enabled(!is_system_theme &&
+@@ -1388,7 +1388,7 @@ void BrowserOptionsHandler::ThemesReset(
+ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
+ }
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+ void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
+ content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
+ Profile* profile = Profile::FromWebUI(web_ui());