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

Side by Side Diff: chrome/browser/chromeos/arc/arc_session_manager.h

Issue 2711033002: Fix Arc integration test. (Closed)
Patch Set: Created 3 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_ARC_ARC_SESSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <ostream> 9 #include <ostream>
10 #include <string> 10 #include <string>
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 // Exposed here for unit_tests validation. 114 // Exposed here for unit_tests validation.
115 static bool IsOobeOptInActive(); 115 static bool IsOobeOptInActive();
116 116
117 // It is called from chrome/browser/prefs/browser_prefs.cc. 117 // It is called from chrome/browser/prefs/browser_prefs.cc.
118 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 118 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
119 119
120 static void DisableUIForTesting(); 120 static void DisableUIForTesting();
121 static void SetShelfDelegateForTesting(ash::ShelfDelegate* shelf_delegate); 121 static void SetShelfDelegateForTesting(ash::ShelfDelegate* shelf_delegate);
122 static void EnableCheckAndroidManagementForTesting(); 122 static void EnableCheckAndroidManagementForTesting();
123 static void SetSessionManagerForSyncTest();
123 124
124 // Returns true if ARC is allowed to run for the current session. 125 // Returns true if ARC is allowed to run for the current session.
125 // TODO(hidehiko): The name is very close to IsArcAllowedForProfile(), but 126 // TODO(hidehiko): The name is very close to IsArcAllowedForProfile(), but
126 // has different meaning. Clean this up. 127 // has different meaning. Clean this up.
127 bool IsAllowed() const; 128 bool IsAllowed() const;
128 129
129 void OnPrimaryUserProfilePrepared(Profile* profile); 130 void OnPrimaryUserProfilePrepared(Profile* profile);
130 void Shutdown(); 131 void Shutdown();
131 132
132 Profile* profile() { return profile_; } 133 Profile* profile() { return profile_; }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 DISALLOW_COPY_AND_ASSIGN(ArcSessionManager); 309 DISALLOW_COPY_AND_ASSIGN(ArcSessionManager);
309 }; 310 };
310 311
311 // Outputs the stringified |state| to |os|. This is only for logging purposes. 312 // Outputs the stringified |state| to |os|. This is only for logging purposes.
312 std::ostream& operator<<(std::ostream& os, 313 std::ostream& operator<<(std::ostream& os,
313 const ArcSessionManager::State& state); 314 const ArcSessionManager::State& state);
314 315
315 } // namespace arc 316 } // namespace arc
316 317
317 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_ 318 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_session_manager.cc » ('j') | chrome/browser/chromeos/arc/arc_session_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698