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

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

Issue 2894743002: Make launching apps from shelf more intuitive (Closed)
Patch Set: This patch set has many platform related issue Created 3 years, 7 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 82b7199f20498fa4f9c4d22c15682dfa14ffc177..daa144ceff41a7d3bcd0d3a282b526dff475c693 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -26,6 +26,7 @@
#include "components/prefs/pref_change_registrar.h"
#include "components/sync_preferences/pref_service_syncable_observer.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
+#include "ui/aura/window.h"
class AccountId;
class AppIconLoader;
@@ -120,11 +121,6 @@ class ChromeLauncherController
// Adds or removes an item as needed to respect the running and pinned state.
void SetV1AppStatus(const std::string& app_id, ash::ShelfItemStatus status);
- // Requests that the shelf item controller specified by |id| open a new
- // instance of the app. |event_flags| holds the flags of the event which
- // triggered this command.
- void Launch(const ash::ShelfID& id, int event_flags);
-
// Closes the specified item.
void Close(const ash::ShelfID& id);
@@ -135,10 +131,12 @@ class ChromeLauncherController
bool IsPlatformApp(const ash::ShelfID& id);
// Opens a new instance of the application identified by the ShelfID.
- // Used by the app-list, and by pinned-app shelf items.
+ // Used by the app-list, and by pinned-app shelf items. |root_window| is the
+ // root window from which the app is launched.
void LaunchApp(const ash::ShelfID& id,
ash::ShelfLaunchSource source,
- int event_flags);
+ int event_flags,
+ const aura::Window* root_window);
// If |app_id| is running, reactivates the app's most recently active window,
// otherwise launches and activates the app.

Powered by Google App Engine
This is Rietveld 408576698