| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "apps/app_window.h" | 10 #include "apps/app_window.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 #include "content/public/browser/notification_service.h" | 82 #include "content/public/browser/notification_service.h" |
| 83 #include "content/public/browser/notification_source.h" | 83 #include "content/public/browser/notification_source.h" |
| 84 #include "content/public/browser/notification_types.h" | 84 #include "content/public/browser/notification_types.h" |
| 85 #include "content/public/browser/url_data_source.h" | 85 #include "content/public/browser/url_data_source.h" |
| 86 #include "content/public/browser/user_metrics.h" | 86 #include "content/public/browser/user_metrics.h" |
| 87 #include "content/public/browser/web_contents.h" | 87 #include "content/public/browser/web_contents.h" |
| 88 #include "content/public/common/page_zoom.h" | 88 #include "content/public/common/page_zoom.h" |
| 89 #include "extensions/browser/extension_registry.h" | 89 #include "extensions/browser/extension_registry.h" |
| 90 #include "google_apis/gaia/gaia_auth_util.h" | 90 #include "google_apis/gaia/gaia_auth_util.h" |
| 91 #include "google_apis/gaia/google_service_auth_error.h" | 91 #include "google_apis/gaia/google_service_auth_error.h" |
| 92 #include "grit/theme_resources.h" | |
| 93 #include "third_party/skia/include/core/SkBitmap.h" | 92 #include "third_party/skia/include/core/SkBitmap.h" |
| 94 #include "ui/base/l10n/l10n_util.h" | 93 #include "ui/base/l10n/l10n_util.h" |
| 95 #include "ui/base/webui/web_ui_util.h" | 94 #include "ui/base/webui/web_ui_util.h" |
| 96 | 95 |
| 97 #if !defined(OS_CHROMEOS) | 96 #if !defined(OS_CHROMEOS) |
| 98 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" | 97 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" |
| 99 #endif | 98 #endif |
| 100 | 99 |
| 101 #if defined(OS_CHROMEOS) | 100 #if defined(OS_CHROMEOS) |
| 102 #include "ash/ash_switches.h" | 101 #include "ash/ash_switches.h" |
| (...skipping 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1863 extension = extensions::GetExtensionOverridingProxy( | 1862 extension = extensions::GetExtensionOverridingProxy( |
| 1864 Profile::FromWebUI(web_ui())); | 1863 Profile::FromWebUI(web_ui())); |
| 1865 AppendExtensionData("proxy", extension, &extension_controlled); | 1864 AppendExtensionData("proxy", extension, &extension_controlled); |
| 1866 | 1865 |
| 1867 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", | 1866 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", |
| 1868 extension_controlled); | 1867 extension_controlled); |
| 1869 #endif // defined(OS_WIN) | 1868 #endif // defined(OS_WIN) |
| 1870 } | 1869 } |
| 1871 | 1870 |
| 1872 } // namespace options | 1871 } // namespace options |
| OLD | NEW |