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

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

Issue 697953002: ObserverList::HasObserver now takes a const pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile errors (ChromeOS unit tests). Created 6 years, 1 month 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
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const std::string& policy_blob) { 80 const std::string& policy_blob) {
81 device_local_account_policy_[id].policy_blob_ = policy_blob; 81 device_local_account_policy_[id].policy_blob_ = policy_blob;
82 } 82 }
83 83
84 // SessionManagerClient: 84 // SessionManagerClient:
85 virtual void Init(dbus::Bus* bus) override; 85 virtual void Init(dbus::Bus* bus) override;
86 virtual void SetStubDelegate(SessionManagerClient::StubDelegate* delegate) 86 virtual void SetStubDelegate(SessionManagerClient::StubDelegate* delegate)
87 override; 87 override;
88 virtual void AddObserver(Observer* observer) override; 88 virtual void AddObserver(Observer* observer) override;
89 virtual void RemoveObserver(Observer* observer) override; 89 virtual void RemoveObserver(Observer* observer) override;
90 virtual bool HasObserver(Observer* observer) override; 90 virtual bool HasObserver(const Observer* observer) const override;
91 virtual void EmitLoginPromptVisible() override; 91 virtual void EmitLoginPromptVisible() override;
92 virtual void RestartJob(int pid, const std::string& command_line) override; 92 virtual void RestartJob(int pid, const std::string& command_line) override;
93 virtual void StartSession(const std::string& user_email) override; 93 virtual void StartSession(const std::string& user_email) override;
94 virtual void StopSession() override; 94 virtual void StopSession() override;
95 virtual void StartDeviceWipe() override; 95 virtual void StartDeviceWipe() override;
96 virtual void RequestLockScreen() override; 96 virtual void RequestLockScreen() override;
97 virtual void NotifyLockScreenShown() override; 97 virtual void NotifyLockScreenShown() override;
98 virtual void NotifyLockScreenDismissed() override; 98 virtual void NotifyLockScreenDismissed() override;
99 virtual void RetrieveActiveSessions( 99 virtual void RetrieveActiveSessions(
100 const ActiveSessionsCallback& callback) override; 100 const ActiveSessionsCallback& callback) override;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 scoped_ptr<DBusThreadManagerSetter> dbus_setter_; 194 scoped_ptr<DBusThreadManagerSetter> dbus_setter_;
195 195
196 private: 196 private:
197 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase); 197 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
198 }; 198 };
199 199
200 } // namespace chromeos 200 } // namespace chromeos
201 201
202 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 202 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « base/observer_list_unittest.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