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

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

Issue 2039543002: Getting rid of ChromeLauncherController::model(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing git cl dependencies Created 4 years, 6 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/browser_shortcut_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
index f6cd262d54a3f7a11450801bd801588732fb72a1..1c13bc461fe084bd9697967630001bf705670747 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
@@ -9,6 +9,10 @@
#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
#include "chrome/browser/ui/browser_list.h"
+namespace ash {
+class ShelfModel;
+}
+
namespace content {
class WebContents;
}
@@ -23,8 +27,8 @@ class ChromeLauncherController;
// Item controller for an browser shortcut.
class BrowserShortcutLauncherItemController : public LauncherItemController {
public:
- explicit BrowserShortcutLauncherItemController(
- ChromeLauncherController* controller);
+ BrowserShortcutLauncherItemController(ChromeLauncherController* controller,
+ ash::ShelfModel* shelf_model);
~BrowserShortcutLauncherItemController() override;
@@ -78,6 +82,8 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
// Get a list of active browsers.
BrowserList::BrowserVector GetListOfActiveBrowsers();
+ ash::ShelfModel* shelf_model_;
+
DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController);
};

Powered by Google App Engine
This is Rietveld 408576698