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

Side by Side Diff: chrome/browser/ui/webui/flags_ui.cc

Issue 2187473003: Remove #includes of "xxx_google_chrome_strings.h". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 4 years, 4 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
« no previous file with comments | « chrome/browser/ui/webui/crashes_ui.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/flags_ui.h" 5 #include "chrome/browser/ui/webui/flags_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 13 matching lines...) Expand all
24 #include "components/flags_ui/flags_ui_pref_names.h" 24 #include "components/flags_ui/flags_ui_pref_names.h"
25 #include "components/flags_ui/pref_service_flags_storage.h" 25 #include "components/flags_ui/pref_service_flags_storage.h"
26 #include "components/prefs/pref_registry_simple.h" 26 #include "components/prefs/pref_registry_simple.h"
27 #include "components/prefs/pref_service.h" 27 #include "components/prefs/pref_service.h"
28 #include "components/version_info/version_info.h" 28 #include "components/version_info/version_info.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/browser/web_ui.h" 30 #include "content/public/browser/web_ui.h"
31 #include "content/public/browser/web_ui_data_source.h" 31 #include "content/public/browser/web_ui_data_source.h"
32 #include "content/public/browser/web_ui_message_handler.h" 32 #include "content/public/browser/web_ui_message_handler.h"
33 #include "grit/components_chromium_strings.h" 33 #include "grit/components_chromium_strings.h"
34 #include "grit/components_google_chrome_strings.h"
35 #include "grit/components_resources.h" 34 #include "grit/components_resources.h"
36 #include "grit/components_scaled_resources.h" 35 #include "grit/components_scaled_resources.h"
37 #include "grit/components_strings.h" 36 #include "grit/components_strings.h"
38 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
40 39
41 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
42 #include "base/sys_info.h" 41 #include "base/sys_info.h"
43 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" 42 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
44 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 43 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 333
335 FlagsUI::~FlagsUI() { 334 FlagsUI::~FlagsUI() {
336 } 335 }
337 336
338 // static 337 // static
339 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes( 338 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes(
340 ui::ScaleFactor scale_factor) { 339 ui::ScaleFactor scale_factor) {
341 return ResourceBundle::GetSharedInstance(). 340 return ResourceBundle::GetSharedInstance().
342 LoadDataResourceBytesForScale(IDR_FLAGS_FAVICON, scale_factor); 341 LoadDataResourceBytesForScale(IDR_FLAGS_FAVICON, scale_factor);
343 } 342 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/crashes_ui.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698