| Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| index cbbfc6bb901f5af20166f335c7f48df0e538817b..79aadc7c28992e008243fc4ebc8a70b2ead6d865 100644
|
| --- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| @@ -13,8 +13,8 @@
|
| #include "base/stl_util.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/utf_string_conversions.h"
|
| -#include "base/values.h"
|
| #include "base/value_conversions.h"
|
| +#include "base/values.h"
|
| #include "chrome/browser/auto_launch_trial.h"
|
| #include "chrome/browser/autocomplete/autocomplete.h"
|
| #include "chrome/browser/autocomplete/autocomplete_match.h"
|
| @@ -77,7 +77,7 @@
|
| #endif // defined(OS_WIN)
|
|
|
| #if defined(TOOLKIT_GTK)
|
| -#include "chrome/browser/ui/gtk/gtk_theme_service.h"
|
| +#include "chrome/browser/ui/gtk/theme_service_gtk.h"
|
| #endif // defined(TOOLKIT_GTK)
|
|
|
| using content::BrowserThread;
|
| @@ -699,7 +699,7 @@ void BrowserOptionsHandler::CreateProfile(const ListValue* args) {
|
| void BrowserOptionsHandler::ObserveThemeChanged() {
|
| Profile* profile = Profile::FromWebUI(web_ui());
|
| #if defined(TOOLKIT_GTK)
|
| - GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
|
| + ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(profile);
|
| bool is_gtk_theme = theme_service->UsingNativeTheme();
|
| base::FundamentalValue gtk_enabled(!is_gtk_theme);
|
| web_ui()->CallJavascriptFunction("BrowserOptions.setGtkThemeButtonEnabled",
|
|
|