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

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

Issue 8799006: Replace the Slideshow with the Photo Editor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated manifest, postponed deleting slideshow.html Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 kOsAll, 392 kOsAll,
393 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) 393 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack)
394 }, 394 },
395 { 395 {
396 "extension-alerts", 396 "extension-alerts",
397 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_NAME, 397 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_NAME,
398 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION, 398 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION,
399 kOsAll, 399 kOsAll,
400 SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts) 400 SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts)
401 }, 401 },
402 #if defined(OS_CHROMEOS)
403 {
404 "enable-photo-editor",
405 IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME,
406 IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION,
407 kOsCrOS,
408 SINGLE_VALUE_TYPE(switches::kEnablePhotoEditor)
409 },
410 #endif
411 { 402 {
412 "enable-media-source", 403 "enable-media-source",
413 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME, 404 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME,
414 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION, 405 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION,
415 kOsAll, 406 kOsAll,
416 SINGLE_VALUE_TYPE(switches::kEnableMediaSource) 407 SINGLE_VALUE_TYPE(switches::kEnableMediaSource)
417 }, 408 },
418 { 409 {
419 "enable-pointer-lock", 410 "enable-pointer-lock",
420 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME, 411 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME,
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 } 851 }
861 852
862 const Experiment* GetExperiments(size_t* count) { 853 const Experiment* GetExperiments(size_t* count) {
863 *count = num_experiments; 854 *count = num_experiments;
864 return experiments; 855 return experiments;
865 } 856 }
866 857
867 } // namespace testing 858 } // namespace testing
868 859
869 } // namespace about_flags 860 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_file_browser_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698