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

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

Issue 178863002: Implement settings in a widnow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/first_run/first_run.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>
(...skipping 1842 matching lines...) Expand 10 before | Expand all | Expand 10 after
1853 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, 1853 kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
1854 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) 1854 MULTI_VALUE_TYPE(kTouchScrollingModeChoices)
1855 }, 1855 },
1856 { 1856 {
1857 "bleeding-edge-renderer-mode", 1857 "bleeding-edge-renderer-mode",
1858 IDS_FLAGS_BLEEDING_RENDERER_NAME, 1858 IDS_FLAGS_BLEEDING_RENDERER_NAME,
1859 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, 1859 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION,
1860 kOsAll, 1860 kOsAll,
1861 SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths) 1861 SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths)
1862 }, 1862 },
1863 {
1864 "enable-settings-window",
1865 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME,
1866 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION,
1867 kOsDesktop,
1868 SINGLE_VALUE_TYPE(switches::kEnableSettingsWindow)
1869 },
1863 }; 1870 };
1864 1871
1865 const Experiment* experiments = kExperiments; 1872 const Experiment* experiments = kExperiments;
1866 size_t num_experiments = arraysize(kExperiments); 1873 size_t num_experiments = arraysize(kExperiments);
1867 1874
1868 // Stores and encapsulates the little state that about:flags has. 1875 // Stores and encapsulates the little state that about:flags has.
1869 class FlagsState { 1876 class FlagsState {
1870 public: 1877 public:
1871 FlagsState() : needs_restart_(false) {} 1878 FlagsState() : needs_restart_(false) {}
1872 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, 1879 void ConvertFlagsToSwitches(FlagsStorage* flags_storage,
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
2377 } 2384 }
2378 2385
2379 const Experiment* GetExperiments(size_t* count) { 2386 const Experiment* GetExperiments(size_t* count) {
2380 *count = num_experiments; 2387 *count = num_experiments;
2381 return experiments; 2388 return experiments;
2382 } 2389 }
2383 2390
2384 } // namespace testing 2391 } // namespace testing
2385 2392
2386 } // namespace about_flags 2393 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698