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

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: 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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 kOsWin, 525 kOsWin,
526 SINGLE_VALUE_TYPE(switches::kTabBrowserDragging) 526 SINGLE_VALUE_TYPE(switches::kTabBrowserDragging)
527 }, 527 },
528 { 528 {
529 "enable-restore-session-state", 529 "enable-restore-session-state",
530 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_NAME, 530 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_NAME,
531 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_DESCRIPTION, 531 IDS_FLAGS_ENABLE_RESTORE_SESSION_STATE_DESCRIPTION,
532 kOsAll, 532 kOsAll,
533 SINGLE_VALUE_TYPE(switches::kEnableRestoreSessionState) 533 SINGLE_VALUE_TYPE(switches::kEnableRestoreSessionState)
534 }, 534 },
535 #if defined(OS_CHROMEOS)
536 {
537 "enable-kiosk-mode",
538 IDS_FLAGS_ENABLE_KIOSK_MODE_NAME,
539 IDS_FLAGS_ENABLE_KIOSK_MODE_DESCRIPTION,
540 kOsCrOS,
541 SINGLE_VALUE_TYPE(switches::kEnableKioskMode)
542 },
543 #endif
535 }; 544 };
536 545
537 const Experiment* experiments = kExperiments; 546 const Experiment* experiments = kExperiments;
538 size_t num_experiments = arraysize(kExperiments); 547 size_t num_experiments = arraysize(kExperiments);
539 548
540 // Stores and encapsulates the little state that about:flags has. 549 // Stores and encapsulates the little state that about:flags has.
541 class FlagsState { 550 class FlagsState {
542 public: 551 public:
543 FlagsState() : needs_restart_(false) {} 552 FlagsState() : needs_restart_(false) {}
544 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 553 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 } 967 }
959 968
960 const Experiment* GetExperiments(size_t* count) { 969 const Experiment* GetExperiments(size_t* count) {
961 *count = num_experiments; 970 *count = num_experiments;
962 return experiments; 971 return experiments;
963 } 972 }
964 973
965 } // namespace testing 974 } // namespace testing
966 975
967 } // namespace about_flags 976 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698