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

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

Issue 1823923002: arc: Support running Arc app in shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased + few nits Created 4 years, 9 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.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 69f1f30e655545296367c065df4591c370677243..45ec292198ac835e8b0597ff2ecde1c7c35d4882 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -389,7 +389,7 @@ class ChromeLauncherController
// Access to the AppWindowLauncherController for tests.
AppWindowLauncherController* app_window_controller_for_test() {
- return app_window_controller_.get();
+ return app_window_controllers_[0].get();
}
bool CanPin(const std::string& app_id);
@@ -558,7 +558,7 @@ class ChromeLauncherController
WebContentsToAppIDMap web_contents_to_app_id_;
// Used to track app windows.
- scoped_ptr<AppWindowLauncherController> app_window_controller_;
+ std::vector<scoped_ptr<AppWindowLauncherController>> app_window_controllers_;
// Used to get app info for tabs.
scoped_ptr<AppTabHelper> app_tab_helper_;

Powered by Google App Engine
This is Rietveld 408576698