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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

Issue 2325743002: arc: Disable shelf item creation when secondary user is active. (Closed)
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index 2561fd4a64ad2fa0e1ba38055caa9d699654e72d..61a76aaa4b121608682bea2e502b59921b1f6dfe 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -139,14 +139,17 @@ class ChromeLauncherControllerImpl
void OnUserProfileReadyToSwitch(Profile* profile) override;
ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
+ void SetProfileForTest(Profile* profile);
+
// Access to the BrowserStatusMonitor for tests.
BrowserStatusMonitor* browser_status_monitor_for_test() {
return browser_status_monitor_.get();
}
- // Access to the AppWindowLauncherController for tests.
- AppWindowLauncherController* app_window_controller_for_test() {
- return app_window_controllers_[0].get();
+ // Access to the AppWindowLauncherController list for tests.
+ const std::vector<std::unique_ptr<AppWindowLauncherController>>&
+ app_window_controllers_for_test() {
+ return app_window_controllers_;
}
// ash::ShelfDelegate:
@@ -284,7 +287,7 @@ class ChromeLauncherControllerImpl
ash::ShelfItemDelegate* item_delegate);
// Attach to a specific profile.
- void AttachProfile(Profile* proifile);
+ void AttachProfile(Profile* profile);
// Forget the current profile to allow attaching to a new one.
void ReleaseProfile();

Powered by Google App Engine
This is Rietveld 408576698