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

Side by Side Diff: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h

Issue 2487953003: Remove LauncherItemController::IsOpen, check ShelfItem::status. (Closed)
Patch Set: Address comments. Created 4 years, 1 month 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"
(...skipping 25 matching lines...) Expand all
36 void UpdateBrowserItemState(); 36 void UpdateBrowserItemState();
37 37
38 // 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.
39 void SetShelfIDForBrowserWindowContents(Browser* browser, 39 void SetShelfIDForBrowserWindowContents(Browser* browser,
40 content::WebContents* web_contents); 40 content::WebContents* web_contents);
41 41
42 // Check if there is any active browsers windows. 42 // Check if there is any active browsers windows.
43 bool IsListOfActiveBrowserEmpty(); 43 bool IsListOfActiveBrowserEmpty();
44 44
45 // LauncherItemController overrides: 45 // LauncherItemController overrides:
46 bool IsOpen() const override;
47 bool IsVisible() const override; 46 bool IsVisible() const override;
48 void Launch(ash::LaunchSource source, int event_flags) override; 47 void Launch(ash::LaunchSource source, int event_flags) override;
49 ShelfItemDelegate::PerformedAction Activate( 48 ShelfItemDelegate::PerformedAction Activate(
50 ash::LaunchSource source) override; 49 ash::LaunchSource source) override;
51 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 50 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
52 ash::ShelfItemDelegate::PerformedAction ItemSelected( 51 ash::ShelfItemDelegate::PerformedAction ItemSelected(
53 const ui::Event& event) override; 52 const ui::Event& event) override;
54 base::string16 GetTitle() override; 53 base::string16 GetTitle() override;
55 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 54 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
56 bool IsDraggable() override; 55 bool IsDraggable() override;
(...skipping 24 matching lines...) Expand all
81 80
82 // Get a list of active browsers. 81 // Get a list of active browsers.
83 BrowserList::BrowserVector GetListOfActiveBrowsers(); 82 BrowserList::BrowserVector GetListOfActiveBrowsers();
84 83
85 ash::ShelfModel* shelf_model_; 84 ash::ShelfModel* shelf_model_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController); 86 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController);
88 }; 87 };
89 88
90 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_ 89 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698