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

Side by Side Diff: chrome/browser/ui/ash/launcher/app_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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 ~AppShortcutLauncherItemController() override; 30 ~AppShortcutLauncherItemController() override;
31 31
32 static AppShortcutLauncherItemController* Create( 32 static AppShortcutLauncherItemController* Create(
33 const std::string& app_id, 33 const std::string& app_id,
34 const std::string& launch_id, 34 const std::string& launch_id,
35 ChromeLauncherController* controller); 35 ChromeLauncherController* controller);
36 36
37 std::vector<content::WebContents*> GetRunningApplications(); 37 std::vector<content::WebContents*> GetRunningApplications();
38 38
39 // LauncherItemController overrides: 39 // LauncherItemController overrides:
40 bool IsOpen() const override;
41 bool IsVisible() const override; 40 bool IsVisible() const override;
42 void Launch(ash::LaunchSource source, int event_flags) override; 41 void Launch(ash::LaunchSource source, int event_flags) override;
43 ash::ShelfItemDelegate::PerformedAction Activate( 42 ash::ShelfItemDelegate::PerformedAction Activate(
44 ash::LaunchSource source) override; 43 ash::LaunchSource source) override;
45 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 44 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
46 ash::ShelfItemDelegate::PerformedAction ItemSelected( 45 ash::ShelfItemDelegate::PerformedAction ItemSelected(
47 const ui::Event& event) override; 46 const ui::Event& event) override;
48 base::string16 GetTitle() override; 47 base::string16 GetTitle() override;
49 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 48 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
50 bool IsDraggable() override; 49 bool IsDraggable() override;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 110
112 // An id that can be passed to an app when launched in order to support 111 // An id that can be passed to an app when launched in order to support
113 // multiple shelf items per app. This id is used together with the app_id to 112 // multiple shelf items per app. This id is used together with the app_id to
114 // uniquely identify each shelf item that has the same app_id. 113 // uniquely identify each shelf item that has the same app_id.
115 const std::string launch_id_; 114 const std::string launch_id_;
116 115
117 DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController); 116 DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController);
118 }; 117 };
119 118
120 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_ H_ 119 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698