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

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

Issue 23068021: Remove PerBrowser launcher, reland step 1 of 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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/app_shortcut_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
index bae7e3c8071eb6fa5df43b35f21f5dae6ef92946..bf8ab68a59ce92e29705c9758b0c1b46a1d4e858 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
@@ -8,8 +8,10 @@
#include <string>
#include "base/time/time.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
+#include "url/gurl.h"
+
+class URLPattern;
namespace aura {
class Window;
@@ -27,7 +29,7 @@ class ChromeLauncherController;
class AppShortcutLauncherItemController : public LauncherItemController {
public:
AppShortcutLauncherItemController(const std::string& app_id,
- ChromeLauncherControllerPerApp* controller);
+ ChromeLauncherController* controller);
virtual ~AppShortcutLauncherItemController();
@@ -79,12 +81,13 @@ class AppShortcutLauncherItemController : public LauncherItemController {
bool AllowNextLaunchAttempt();
GURL refocus_url_;
- ChromeLauncherControllerPerApp* app_controller_;
// Since V2 applications can be undetectable after launching, this timer is
// keeping track of the last launch attempt.
base::Time last_launch_attempt_;
+ ChromeLauncherController* chrome_launcher_controller_;
+
DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController);
};

Powered by Google App Engine
This is Rietveld 408576698