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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_test_helper.h

Issue 23694025: Remove calls to deprecated session_manager DBus methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix use-after-free in tests. 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
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_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 79
80 // SessionManagerClient: 80 // SessionManagerClient:
81 virtual void Init(dbus::Bus* bus) OVERRIDE; 81 virtual void Init(dbus::Bus* bus) OVERRIDE;
82 virtual void AddObserver(Observer* observer) OVERRIDE; 82 virtual void AddObserver(Observer* observer) OVERRIDE;
83 virtual void RemoveObserver(Observer* observer) OVERRIDE; 83 virtual void RemoveObserver(Observer* observer) OVERRIDE;
84 virtual bool HasObserver(Observer* observer) OVERRIDE; 84 virtual bool HasObserver(Observer* observer) OVERRIDE;
85 virtual void EmitLoginPromptReady() OVERRIDE; 85 virtual void EmitLoginPromptReady() OVERRIDE;
86 virtual void EmitLoginPromptVisible() OVERRIDE; 86 virtual void EmitLoginPromptVisible() OVERRIDE;
87 virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE; 87 virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE;
88 virtual void RestartEntd() OVERRIDE;
89 virtual void StartSession(const std::string& user_email) OVERRIDE; 88 virtual void StartSession(const std::string& user_email) OVERRIDE;
90 virtual void StopSession() OVERRIDE; 89 virtual void StopSession() OVERRIDE;
91 virtual void StartDeviceWipe() OVERRIDE; 90 virtual void StartDeviceWipe() OVERRIDE;
92 virtual void RequestLockScreen() OVERRIDE; 91 virtual void RequestLockScreen() OVERRIDE;
93 virtual void NotifyLockScreenShown() OVERRIDE; 92 virtual void NotifyLockScreenShown() OVERRIDE;
94 virtual void RequestUnlockScreen() OVERRIDE;
95 virtual void NotifyLockScreenDismissed() OVERRIDE; 93 virtual void NotifyLockScreenDismissed() OVERRIDE;
96 virtual void RetrieveActiveSessions( 94 virtual void RetrieveActiveSessions(
97 const ActiveSessionsCallback& callback) OVERRIDE; 95 const ActiveSessionsCallback& callback) OVERRIDE;
98 virtual void RetrieveDevicePolicy( 96 virtual void RetrieveDevicePolicy(
99 const RetrievePolicyCallback& callback) OVERRIDE; 97 const RetrievePolicyCallback& callback) OVERRIDE;
100 virtual void RetrievePolicyForUser( 98 virtual void RetrievePolicyForUser(
101 const std::string& username, 99 const std::string& username,
102 const RetrievePolicyCallback& callback) OVERRIDE; 100 const RetrievePolicyCallback& callback) OVERRIDE;
103 virtual std::string BlockingRetrievePolicyForUser( 101 virtual std::string BlockingRetrievePolicyForUser(
104 const std::string& username) OVERRIDE; 102 const std::string& username) OVERRIDE;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // with the global instance (DeviceSettingsService::Get()). 180 // with the global instance (DeviceSettingsService::Get()).
183 DeviceSettingsService device_settings_service_; 181 DeviceSettingsService device_settings_service_;
184 182
185 private: 183 private:
186 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase); 184 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
187 }; 185 };
188 186
189 } // namespace chromeos 187 } // namespace chromeos
190 188
191 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 189 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/power/screen_lock_observer.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698