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

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

Issue 9265026: Implement restart on Idle for Kiosk Mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 8 years, 11 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
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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 kOsWin, 516 kOsWin,
517 SINGLE_VALUE_TYPE(switches::kTabBrowserDragging) 517 SINGLE_VALUE_TYPE(switches::kTabBrowserDragging)
518 }, 518 },
519 { 519 {
520 "enable-restore-session-state", 520 "enable-restore-session-state",
521 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_NAME, 521 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_NAME,
522 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_DESCRIPTION, 522 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_DESCRIPTION,
523 kOsAll, 523 kOsAll,
524 SINGLE_VALUE_TYPE(switches::kEnableRestoreSessionState) 524 SINGLE_VALUE_TYPE(switches::kEnableRestoreSessionState)
525 }, 525 },
526 #if defined(OS_CHROMEOS)
527 {
528 "enable-retail-mode",
529 IDS_FLAGS_ENABLE_RETAIL_MODE_NAME,
530 IDS_FLAGS_ENABLE_RETAIL_MODE_DESCRIPTION,
531 kOsCrOS,
532 SINGLE_VALUE_TYPE(switches::kEnableRetailMode)
533 },
534 #endif
526 { 535 {
527 "disable-software-rasterizer", 536 "disable-software-rasterizer",
528 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, 537 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME,
529 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, 538 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION,
530 #if defined(ENABLE_SWIFTSHADER) 539 #if defined(ENABLE_SWIFTSHADER)
531 kOsAll, 540 kOsAll,
532 #else 541 #else
533 0, 542 0,
534 #endif 543 #endif
535 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) 544 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 } 988 }
980 989
981 const Experiment* GetExperiments(size_t* count) { 990 const Experiment* GetExperiments(size_t* count) {
982 *count = num_experiments; 991 *count = num_experiments;
983 return experiments; 992 return experiments;
984 } 993 }
985 994
986 } // namespace testing 995 } // namespace testing
987 996
988 } // namespace about_flags 997 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698