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

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

Issue 17379019: Seperate NaCl switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move nacl_switches to components Created 7 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/DEPS ('k') | chrome/browser/nacl_host/nacl_broker_host_win.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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "cc/base/switches.h" 18 #include "cc/base/switches.h"
19 #include "chrome/browser/flags_storage.h" 19 #include "chrome/browser/flags_storage.h"
20 #include "chrome/common/chrome_content_client.h" 20 #include "chrome/common/chrome_content_client.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "components/nacl/common/nacl_switches.h"
22 #include "content/public/browser/user_metrics.h" 23 #include "content/public/browser/user_metrics.h"
23 #include "grit/chromium_strings.h" 24 #include "grit/chromium_strings.h"
24 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
25 #include "grit/google_chrome_strings.h" 26 #include "grit/google_chrome_strings.h"
26 #include "media/base/media_switches.h" 27 #include "media/base/media_switches.h"
27 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/ui_base_switches.h" 29 #include "ui/base/ui_base_switches.h"
29 #include "ui/gfx/switches.h" 30 #include "ui/gfx/switches.h"
30 #include "ui/gl/gl_switches.h" 31 #include "ui/gl/gl_switches.h"
31 #include "ui/keyboard/keyboard_switches.h" 32 #include "ui/keyboard/keyboard_switches.h"
(...skipping 2017 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 } 2050 }
2050 2051
2051 const Experiment* GetExperiments(size_t* count) { 2052 const Experiment* GetExperiments(size_t* count) {
2052 *count = num_experiments; 2053 *count = num_experiments;
2053 return experiments; 2054 return experiments;
2054 } 2055 }
2055 2056
2056 } // namespace testing 2057 } // namespace testing
2057 2058
2058 } // namespace about_flags 2059 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/nacl_host/nacl_broker_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698