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

Side by Side Diff: chrome/browser/about_flags.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 | « no previous file | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm » ('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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 14 matching lines...) Expand all
25 #include "base/values.h" 25 #include "base/values.h"
26 #include "build/build_config.h" 26 #include "build/build_config.h"
27 #include "cc/base/switches.h" 27 #include "cc/base/switches.h"
28 #include "chrome/common/channel_info.h" 28 #include "chrome/common/channel_info.h"
29 #include "chrome/common/chrome_content_client.h" 29 #include "chrome/common/chrome_content_client.h"
30 #include "chrome/common/chrome_features.h" 30 #include "chrome/common/chrome_features.h"
31 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/features.h" 32 #include "chrome/common/features.h"
33 #include "chrome/grit/chromium_strings.h" 33 #include "chrome/grit/chromium_strings.h"
34 #include "chrome/grit/generated_resources.h" 34 #include "chrome/grit/generated_resources.h"
35 #include "chrome/grit/google_chrome_strings.h"
36 #include "components/autofill/core/common/autofill_switches.h" 35 #include "components/autofill/core/common/autofill_switches.h"
37 #include "components/browser_sync/common/browser_sync_switches.h" 36 #include "components/browser_sync/common/browser_sync_switches.h"
38 #include "components/cloud_devices/common/cloud_devices_switches.h" 37 #include "components/cloud_devices/common/cloud_devices_switches.h"
39 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" 38 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h"
40 #include "components/dom_distiller/core/dom_distiller_switches.h" 39 #include "components/dom_distiller/core/dom_distiller_switches.h"
41 #include "components/error_page/common/error_page_switches.h" 40 #include "components/error_page/common/error_page_switches.h"
42 #include "components/flags_ui/feature_entry_macros.h" 41 #include "components/flags_ui/feature_entry_macros.h"
43 #include "components/flags_ui/flags_storage.h" 42 #include "components/flags_ui/flags_storage.h"
44 #include "components/flags_ui/flags_ui_switches.h" 43 #include "components/flags_ui/flags_ui_switches.h"
45 #include "components/nacl/common/nacl_switches.h" 44 #include "components/nacl/common/nacl_switches.h"
(...skipping 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2212 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2211 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2213 2212
2214 const FeatureEntry* GetFeatureEntries(size_t* count) { 2213 const FeatureEntry* GetFeatureEntries(size_t* count) {
2215 *count = arraysize(kFeatureEntries); 2214 *count = arraysize(kFeatureEntries);
2216 return kFeatureEntries; 2215 return kFeatureEntries;
2217 } 2216 }
2218 2217
2219 } // namespace testing 2218 } // namespace testing
2220 2219
2221 } // namespace about_flags 2220 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698