Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 514493002: Cleanup: Remove unneeded grit include in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@grit_clean_chromium_strings_401588_a
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/bind.h" 10 #include "base/bind.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "content/public/browser/notification_service.h" 80 #include "content/public/browser/notification_service.h"
81 #include "content/public/browser/notification_source.h" 81 #include "content/public/browser/notification_source.h"
82 #include "content/public/browser/notification_types.h" 82 #include "content/public/browser/notification_types.h"
83 #include "content/public/browser/url_data_source.h" 83 #include "content/public/browser/url_data_source.h"
84 #include "content/public/browser/user_metrics.h" 84 #include "content/public/browser/user_metrics.h"
85 #include "content/public/browser/web_contents.h" 85 #include "content/public/browser/web_contents.h"
86 #include "content/public/common/page_zoom.h" 86 #include "content/public/common/page_zoom.h"
87 #include "extensions/browser/extension_registry.h" 87 #include "extensions/browser/extension_registry.h"
88 #include "google_apis/gaia/gaia_auth_util.h" 88 #include "google_apis/gaia/gaia_auth_util.h"
89 #include "google_apis/gaia/google_service_auth_error.h" 89 #include "google_apis/gaia/google_service_auth_error.h"
90 #include "grit/theme_resources.h"
91 #include "third_party/skia/include/core/SkBitmap.h" 90 #include "third_party/skia/include/core/SkBitmap.h"
92 #include "ui/base/l10n/l10n_util.h" 91 #include "ui/base/l10n/l10n_util.h"
93 #include "ui/base/webui/web_ui_util.h" 92 #include "ui/base/webui/web_ui_util.h"
94 93
95 #if !defined(OS_CHROMEOS) 94 #if !defined(OS_CHROMEOS)
96 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" 95 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
97 #endif 96 #endif
98 97
99 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
100 #include "ash/ash_switches.h" 99 #include "ash/ash_switches.h"
(...skipping 1761 matching lines...) Expand 10 before | Expand all | Expand 10 after
1862 extension = extensions::GetExtensionOverridingProxy( 1861 extension = extensions::GetExtensionOverridingProxy(
1863 Profile::FromWebUI(web_ui())); 1862 Profile::FromWebUI(web_ui()));
1864 AppendExtensionData("proxy", extension, &extension_controlled); 1863 AppendExtensionData("proxy", extension, &extension_controlled);
1865 1864
1866 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1865 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1867 extension_controlled); 1866 extension_controlled);
1868 #endif // defined(OS_WIN) 1867 #endif // defined(OS_WIN)
1869 } 1868 }
1870 1869
1871 } // namespace options 1870 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698