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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 9 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
11 11
12 namespace ash {
13 class ShelfModel;
14 }
15
12 namespace content { 16 namespace content {
13 class WebContents; 17 class WebContents;
14 } 18 }
15 19
16 namespace gfx { 20 namespace gfx {
17 class Image; 21 class Image;
18 } 22 }
19 23
20 class Browser; 24 class Browser;
21 class ChromeLauncherController; 25 class ChromeLauncherController;
22 26
23 // Item controller for an browser shortcut. 27 // Item controller for an browser shortcut.
24 class BrowserShortcutLauncherItemController : public LauncherItemController { 28 class BrowserShortcutLauncherItemController : public LauncherItemController {
25 public: 29 public:
26 explicit BrowserShortcutLauncherItemController( 30 BrowserShortcutLauncherItemController(ChromeLauncherController* controller,
27 ChromeLauncherController* controller); 31 ash::ShelfModel* shelf_model);
28 32
29 ~BrowserShortcutLauncherItemController() override; 33 ~BrowserShortcutLauncherItemController() override;
30 34
31 // Updates the activation state of the Broswer item. 35 // Updates the activation state of the Broswer item.
32 void UpdateBrowserItemState(); 36 void UpdateBrowserItemState();
33 37
34 // Sets the shelf id for the browser window if the browser is represented. 38 // Sets the shelf id for the browser window if the browser is represented.
35 void SetShelfIDForBrowserWindowContents(Browser* browser, 39 void SetShelfIDForBrowserWindowContents(Browser* browser,
36 content::WebContents* web_contents); 40 content::WebContents* web_contents);
37 41
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // kExistingWindowActivated, or kNewWindowCreated. 75 // kExistingWindowActivated, or kNewWindowCreated.
72 PerformedAction ActivateOrAdvanceToNextBrowser(); 76 PerformedAction ActivateOrAdvanceToNextBrowser();
73 77
74 // Returns true when the given |browser| is listed in the browser application 78 // Returns true when the given |browser| is listed in the browser application
75 // list. 79 // list.
76 bool IsBrowserRepresentedInBrowserList(Browser* browser); 80 bool IsBrowserRepresentedInBrowserList(Browser* browser);
77 81
78 // Get a list of active browsers. 82 // Get a list of active browsers.
79 BrowserList::BrowserVector GetListOfActiveBrowsers(); 83 BrowserList::BrowserVector GetListOfActiveBrowsers();
80 84
85 ash::ShelfModel* shelf_model_;
86
81 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController); 87 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController);
82 }; 88 };
83 89
84 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_ 90 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698