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

Side by Side Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h

Issue 23532034: Postpone loading about:flags ui until the certificates have been loaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 | « no previous file | chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc » ('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 #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SETTINGS_H_
6 #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SETTINGS_H_ 6 #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SETTINGS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // Needed here so MockKioskModeSettings can inherit from us. 67 // Needed here so MockKioskModeSettings can inherit from us.
68 KioskModeSettings(); 68 KioskModeSettings();
69 virtual ~KioskModeSettings(); 69 virtual ~KioskModeSettings();
70 70
71 private: 71 private:
72 friend struct base::DefaultLazyInstanceTraits<KioskModeSettings>; 72 friend struct base::DefaultLazyInstanceTraits<KioskModeSettings>;
73 friend class KioskModeSettingsTest; 73 friend class KioskModeSettingsTest;
74 74
75 // Makes sure the browser will switch to kiosk mode if cryptohome was not 75 // Makes sure the browser will switch to kiosk mode if cryptohome was not
76 // ready when the browser was starting after a machine reboot. 76 // ready when the browser was starting after a machine reboot.
77 void VerifyModeIsKnown(DeviceSettingsService::OwnershipStatus status, 77 void VerifyModeIsKnown(DeviceSettingsService::OwnershipStatus status);
78 bool is_owner);
79 78
80 bool is_initialized_; 79 bool is_initialized_;
81 bool is_kiosk_mode_; 80 bool is_kiosk_mode_;
82 81
83 // Used for testing. 82 // Used for testing.
84 void set_initialized(bool value) { is_initialized_ = value; } 83 void set_initialized(bool value) { is_initialized_ = value; }
85 84
86 std::string screensaver_id_; 85 std::string screensaver_id_;
87 std::string screensaver_path_; 86 std::string screensaver_path_;
88 base::TimeDelta screensaver_timeout_; 87 base::TimeDelta screensaver_timeout_;
89 base::TimeDelta idle_logout_timeout_; 88 base::TimeDelta idle_logout_timeout_;
90 base::TimeDelta idle_logout_warning_duration_; 89 base::TimeDelta idle_logout_warning_duration_;
91 90
92 DISALLOW_COPY_AND_ASSIGN(KioskModeSettings); 91 DISALLOW_COPY_AND_ASSIGN(KioskModeSettings);
93 }; 92 };
94 93
95 } // namespace chromeos 94 } // namespace chromeos
96 95
97 #endif // CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SETTINGS_H_ 96 #endif // CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SETTINGS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698