Chromium Code Reviews| Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc |
| index 2f68fd0728a57862d6bf37effbb97568f5894c21..a32d7d56aac61acc8d51b87de402cb1d325ca0fd 100644 |
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
| @@ -1226,18 +1226,18 @@ void BrowserOptionsHandler::DeleteProfile(const base::ListValue* args) { |
| void BrowserOptionsHandler::ObserveThemeChanged() { |
| Profile* profile = Profile::FromWebUI(web_ui()); |
| ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); |
| - bool is_native_theme = false; |
| + bool is_system_theme = false; |
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| bool profile_is_managed = profile->IsManaged(); |
| - is_native_theme = theme_service->UsingNativeTheme(); |
| - base::FundamentalValue native_theme_enabled(!is_native_theme && |
| + is_system_theme = theme_service->UsingSystemTheme(); |
| + base::FundamentalValue native_theme_enabled(!is_system_theme && |
| !profile_is_managed); |
| web_ui()->CallJavascriptFunction("BrowserOptions.setNativeThemeButtonEnabled", |
|
msw
2014/04/22 18:02:13
Q: will you followup and rename this to be consist
Evan Stade
2014/04/22 18:16:06
possibly
|
| native_theme_enabled); |
| #endif |
| - bool is_classic_theme = !is_native_theme && |
| + bool is_classic_theme = !is_system_theme && |
| theme_service->UsingDefaultTheme(); |
| base::FundamentalValue enabled(!is_classic_theme); |
| web_ui()->CallJavascriptFunction("BrowserOptions.setThemesResetButtonEnabled", |
| @@ -1254,7 +1254,7 @@ void BrowserOptionsHandler::ThemesReset(const base::ListValue* args) { |
| void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) { |
|
msw
2014/04/22 18:02:13
Q: will you followup and rename this to be consist
Evan Stade
2014/04/22 18:16:06
possibly
|
| content::RecordAction(UserMetricsAction("Options_GtkThemeSet")); |
| Profile* profile = Profile::FromWebUI(web_ui()); |
| - ThemeServiceFactory::GetForProfile(profile)->SetNativeTheme(); |
| + ThemeServiceFactory::GetForProfile(profile)->UseSystemTheme(); |
| } |
| #endif |