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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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/DEPS ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.h » ('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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 #if BUILDFLAG(ENABLE_APP_LIST) 114 #if BUILDFLAG(ENABLE_APP_LIST)
115 #include "ui/app_list/app_list_switches.h" 115 #include "ui/app_list/app_list_switches.h"
116 #endif // ENABLE_APP_LIST 116 #endif // ENABLE_APP_LIST
117 117
118 #if BUILDFLAG(ENABLE_EXTENSIONS) 118 #if BUILDFLAG(ENABLE_EXTENSIONS)
119 #include "extensions/common/switches.h" 119 #include "extensions/common/switches.h"
120 #endif // ENABLE_EXTENSIONS 120 #endif // ENABLE_EXTENSIONS
121 121
122 #if defined(USE_ASH) 122 #if defined(USE_ASH)
123 #include "ash/common/ash_switches.h" 123 #include "ash/ash_switches.h"
124 #endif // USE_ASH 124 #endif // USE_ASH
125 125
126 #if defined(USE_OZONE) 126 #if defined(USE_OZONE)
127 #include "ui/ozone/public/ozone_switches.h" 127 #include "ui/ozone/public/ozone_switches.h"
128 #endif // USE_OZONE 128 #endif // USE_OZONE
129 129
130 using flags_ui::FeatureEntry; 130 using flags_ui::FeatureEntry;
131 using flags_ui::kOsMac; 131 using flags_ui::kOsMac;
132 using flags_ui::kOsWin; 132 using flags_ui::kOsWin;
133 using flags_ui::kOsLinux; 133 using flags_ui::kOsLinux;
(...skipping 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after
2529 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2529 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2530 2530
2531 const FeatureEntry* GetFeatureEntries(size_t* count) { 2531 const FeatureEntry* GetFeatureEntries(size_t* count) {
2532 *count = arraysize(kFeatureEntries); 2532 *count = arraysize(kFeatureEntries);
2533 return kFeatureEntries; 2533 return kFeatureEntries;
2534 } 2534 }
2535 2535
2536 } // namespace testing 2536 } // namespace testing
2537 2537
2538 } // namespace about_flags 2538 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698