1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
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());
|
