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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator. (Closed)
Patch Set: Fix merge Created 3 years, 6 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/BUILD.gn ('k') | chrome/browser/io_thread.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/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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "components/dom_distiller/core/dom_distiller_switches.h" 46 #include "components/dom_distiller/core/dom_distiller_switches.h"
47 #include "components/error_page/common/error_page_switches.h" 47 #include "components/error_page/common/error_page_switches.h"
48 #include "components/favicon/core/features.h" 48 #include "components/favicon/core/features.h"
49 #include "components/feature_engagement_tracker/public/feature_constants.h" 49 #include "components/feature_engagement_tracker/public/feature_constants.h"
50 #include "components/feature_engagement_tracker/public/feature_list.h" 50 #include "components/feature_engagement_tracker/public/feature_list.h"
51 #include "components/flags_ui/feature_entry.h" 51 #include "components/flags_ui/feature_entry.h"
52 #include "components/flags_ui/feature_entry_macros.h" 52 #include "components/flags_ui/feature_entry_macros.h"
53 #include "components/flags_ui/flags_storage.h" 53 #include "components/flags_ui/flags_storage.h"
54 #include "components/flags_ui/flags_ui_switches.h" 54 #include "components/flags_ui/flags_ui_switches.h"
55 #include "components/nacl/common/nacl_switches.h" 55 #include "components/nacl/common/nacl_switches.h"
56 #include "components/network_session_configurator/common/network_switches.h"
56 #include "components/ntp_snippets/features.h" 57 #include "components/ntp_snippets/features.h"
57 #include "components/ntp_snippets/ntp_snippets_constants.h" 58 #include "components/ntp_snippets/ntp_snippets_constants.h"
58 #include "components/ntp_tiles/constants.h" 59 #include "components/ntp_tiles/constants.h"
59 #include "components/ntp_tiles/switches.h" 60 #include "components/ntp_tiles/switches.h"
60 #include "components/offline_pages/core/offline_page_feature.h" 61 #include "components/offline_pages/core/offline_page_feature.h"
61 #include "components/omnibox/browser/omnibox_field_trial.h" 62 #include "components/omnibox/browser/omnibox_field_trial.h"
62 #include "components/omnibox/browser/omnibox_switches.h" 63 #include "components/omnibox/browser/omnibox_switches.h"
63 #include "components/password_manager/core/common/password_manager_features.h" 64 #include "components/password_manager/core/common/password_manager_features.h"
64 #include "components/previews/core/previews_features.h" 65 #include "components/previews/core/previews_features.h"
65 #include "components/proximity_auth/switches.h" 66 #include "components/proximity_auth/switches.h"
(...skipping 3224 matching lines...) Expand 10 before | Expand all | Expand 10 after
3290 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3291 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3291 3292
3292 const FeatureEntry* GetFeatureEntries(size_t* count) { 3293 const FeatureEntry* GetFeatureEntries(size_t* count) {
3293 *count = arraysize(kFeatureEntries); 3294 *count = arraysize(kFeatureEntries);
3294 return kFeatureEntries; 3295 return kFeatureEntries;
3295 } 3296 }
3296 3297
3297 } // namespace testing 3298 } // namespace testing
3298 3299
3299 } // namespace about_flags 3300 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698