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

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

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)
Patch Set: rebased + comments updated 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
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/arc/arc_session_manager.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 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // browser_tests 114 // browser_tests
115 virtual void OnArcDataRemoved() {} 115 virtual void OnArcDataRemoved() {}
116 }; 116 };
117 117
118 explicit ArcSessionManager( 118 explicit ArcSessionManager(
119 std::unique_ptr<ArcSessionRunner> arc_session_runner); 119 std::unique_ptr<ArcSessionRunner> arc_session_runner);
120 ~ArcSessionManager() override; 120 ~ArcSessionManager() override;
121 121
122 static ArcSessionManager* Get(); 122 static ArcSessionManager* Get();
123 123
124 // Exposed here for unit_tests validation.
125 static bool IsOobeOptInActive();
126
124 // It is called from chrome/browser/prefs/browser_prefs.cc. 127 // It is called from chrome/browser/prefs/browser_prefs.cc.
125 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 128 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
126 129
127 static void DisableUIForTesting(); 130 static void DisableUIForTesting();
128 static void SetShelfDelegateForTesting(ash::ShelfDelegate* shelf_delegate); 131 static void SetShelfDelegateForTesting(ash::ShelfDelegate* shelf_delegate);
129 static void EnableCheckAndroidManagementForTesting(); 132 static void EnableCheckAndroidManagementForTesting();
130 133
131 // Returns true if Arc is allowed to run for the current session. 134 // Returns true if Arc is allowed to run for the current session.
132 // TODO(hidehiko): The name is very close to IsArcAllowedForProfile(), but 135 // TODO(hidehiko): The name is very close to IsArcAllowedForProfile(), but
133 // has different meaning. Clean this up. 136 // has different meaning. Clean this up.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 DISALLOW_COPY_AND_ASSIGN(ArcSessionManager); 283 DISALLOW_COPY_AND_ASSIGN(ArcSessionManager);
281 }; 284 };
282 285
283 // Outputs the stringified |state| to |os|. This is only for logging purposes. 286 // Outputs the stringified |state| to |os|. This is only for logging purposes.
284 std::ostream& operator<<(std::ostream& os, 287 std::ostream& operator<<(std::ostream& os,
285 const ArcSessionManager::State& state); 288 const ArcSessionManager::State& state);
286 289
287 } // namespace arc 290 } // namespace arc
288 291
289 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_ 292 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/arc/arc_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698