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

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: 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 kOsAll, 388 kOsAll,
389 SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts) 389 SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts)
390 }, 390 },
391 { 391 {
392 "enable-http-pipelining", 392 "enable-http-pipelining",
393 IDS_FLAGS_ENABLE_HTTP_PIPELINING_NAME, 393 IDS_FLAGS_ENABLE_HTTP_PIPELINING_NAME,
394 IDS_FLAGS_ENABLE_HTTP_PIPELINING_DESCRIPTION, 394 IDS_FLAGS_ENABLE_HTTP_PIPELINING_DESCRIPTION,
395 kOsAll, 395 kOsAll,
396 SINGLE_VALUE_TYPE(switches::kEnableHttpPipelining) 396 SINGLE_VALUE_TYPE(switches::kEnableHttpPipelining)
397 }, 397 },
398 #if defined(OS_CHROMEOS)
399 {
400 "enable-photo-editor",
401 IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME,
402 IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION,
403 kOsCrOS,
404 SINGLE_VALUE_TYPE(switches::kEnablePhotoEditor)
405 },
406 #endif
407 { 398 {
408 "enable-media-source", 399 "enable-media-source",
409 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME, 400 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME,
410 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION, 401 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION,
411 kOsAll, 402 kOsAll,
412 SINGLE_VALUE_TYPE(switches::kEnableMediaSource) 403 SINGLE_VALUE_TYPE(switches::kEnableMediaSource)
413 }, 404 },
414 { 405 {
415 "enable-pointer-lock", 406 "enable-pointer-lock",
416 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME, 407 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME,
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 } 847 }
857 848
858 const Experiment* GetExperiments(size_t* count) { 849 const Experiment* GetExperiments(size_t* count) {
859 *count = num_experiments; 850 *count = num_experiments;
860 return experiments; 851 return experiments;
861 } 852 }
862 853
863 } // namespace testing 854 } // namespace testing
864 855
865 } // namespace about_flags 856 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698