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

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

Issue 22314003: NavigationController prototype Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: NavController prototype - chrome side Created 7 years, 3 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/resources/inspect/inspect.js » ('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 16 matching lines...) Expand all
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "grit/google_chrome_strings.h" 28 #include "grit/google_chrome_strings.h"
29 #include "media/base/media_switches.h" 29 #include "media/base/media_switches.h"
30 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/ui_base_switches.h" 31 #include "ui/base/ui_base_switches.h"
32 #include "ui/gfx/switches.h" 32 #include "ui/gfx/switches.h"
33 #include "ui/gl/gl_switches.h" 33 #include "ui/gl/gl_switches.h"
34 #include "ui/keyboard/keyboard_switches.h" 34 #include "ui/keyboard/keyboard_switches.h"
35 #include "ui/message_center/message_center_switches.h" 35 #include "ui/message_center/message_center_switches.h"
36 #include "ui/surface/surface_switches.h" 36 #include "ui/surface/surface_switches.h"
37 #include "webkit/common/appcache/appcache_interfaces.h"
37 38
38 #if defined(USE_ASH) 39 #if defined(USE_ASH)
39 #include "ash/ash_switches.h" 40 #include "ash/ash_switches.h"
40 #endif 41 #endif
41 42
42 #if defined(OS_CHROMEOS) 43 #if defined(OS_CHROMEOS)
43 #include "chromeos/chromeos_switches.h" 44 #include "chromeos/chromeos_switches.h"
44 #include "third_party/cros_system_api/switches/chrome_switches.h" 45 #include "third_party/cros_system_api/switches/chrome_switches.h"
45 #endif 46 #endif
46 47
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 MULTI_VALUE_TYPE(kGDIPresentChoices) 379 MULTI_VALUE_TYPE(kGDIPresentChoices)
379 }, 380 },
380 { 381 {
381 "enable-experimental-canvas-features", 382 "enable-experimental-canvas-features",
382 IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME, 383 IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME,
383 IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION, 384 IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION,
384 kOsAll, 385 kOsAll,
385 SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures) 386 SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)
386 }, 387 },
387 { 388 {
389 "enable-appcache-executable-handlers",
390 IDS_FLAGS_ENABLE_APPCACHE_EXECUTABLE_HANDLERS_NAME,
391 IDS_FLAGS_ENABLE_APPCACHE_EXECUTABLE_HANDLERS_DESCRIPTION,
392 kOsAll,
393 SINGLE_VALUE_TYPE(appcache::kEnableExecutableHandlers)
394 },
395 {
388 "disable-accelerated-2d-canvas", 396 "disable-accelerated-2d-canvas",
389 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME, 397 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME,
390 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION, 398 IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION,
391 kOsAll, 399 kOsAll,
392 SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas) 400 SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)
393 }, 401 },
394 { 402 {
395 "disable-threaded-animation", 403 "disable-threaded-animation",
396 IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME, 404 IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME,
397 IDS_FLAGS_DISABLE_THREADED_ANIMATION_DESCRIPTION, 405 IDS_FLAGS_DISABLE_THREADED_ANIMATION_DESCRIPTION,
(...skipping 1734 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 } 2140 }
2133 2141
2134 const Experiment* GetExperiments(size_t* count) { 2142 const Experiment* GetExperiments(size_t* count) {
2135 *count = num_experiments; 2143 *count = num_experiments;
2136 return experiments; 2144 return experiments;
2137 } 2145 }
2138 2146
2139 } // namespace testing 2147 } // namespace testing
2140 2148
2141 } // namespace about_flags 2149 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/inspect/inspect.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698