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

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

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 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
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 #if defined(ENABLE_EXTENSIONS) 98 #if defined(ENABLE_EXTENSIONS)
99 #include "extensions/common/switches.h" 99 #include "extensions/common/switches.h"
100 #endif 100 #endif
101 101
102 #if defined(ENABLE_PRINT_PREVIEW) 102 #if defined(ENABLE_PRINT_PREVIEW)
103 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h" 103 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h"
104 #endif 104 #endif
105 105
106 #if defined(USE_ASH) 106 #if defined(USE_ASH)
107 #include "ash/ash_switches.h" 107 #include "ash/common/ash_switches.h"
108 #endif 108 #endif
109 109
110 #if defined(USE_OZONE) 110 #if defined(USE_OZONE)
111 #include "ui/ozone/public/ozone_switches.h" 111 #include "ui/ozone/public/ozone_switches.h"
112 #endif 112 #endif
113 113
114 using flags_ui::FeatureEntry; 114 using flags_ui::FeatureEntry;
115 using flags_ui::kOsMac; 115 using flags_ui::kOsMac;
116 using flags_ui::kOsWin; 116 using flags_ui::kOsWin;
117 using flags_ui::kOsLinux; 117 using flags_ui::kOsLinux;
(...skipping 1994 matching lines...) Expand 10 before | Expand all | Expand 10 after
2112 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2112 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2113 2113
2114 const FeatureEntry* GetFeatureEntries(size_t* count) { 2114 const FeatureEntry* GetFeatureEntries(size_t* count) {
2115 *count = arraysize(kFeatureEntries); 2115 *count = arraysize(kFeatureEntries);
2116 return kFeatureEntries; 2116 return kFeatureEntries;
2117 } 2117 }
2118 2118
2119 } // namespace testing 2119 } // namespace testing
2120 2120
2121 } // namespace about_flags 2121 } // namespace about_flags
OLDNEW
« no previous file with comments | « ash/wm/system_gesture_event_filter.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698