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

Side by Side Diff: chrome/browser/ui/ash/launcher/app_window_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 28 matching lines...) Expand all
39 void AddWindow(ui::BaseWindow* window); 39 void AddWindow(ui::BaseWindow* window);
40 void RemoveWindow(ui::BaseWindow* window); 40 void RemoveWindow(ui::BaseWindow* window);
41 41
42 void SetActiveWindow(aura::Window* window); 42 void SetActiveWindow(aura::Window* window);
43 ui::BaseWindow* GetAppWindow(aura::Window* window); 43 ui::BaseWindow* GetAppWindow(aura::Window* window);
44 44
45 const std::string& app_id() const { return app_id_; } 45 const std::string& app_id() const { return app_id_; }
46 const std::string& launch_id() const { return launch_id_; } 46 const std::string& launch_id() const { return launch_id_; }
47 47
48 // LauncherItemController overrides: 48 // LauncherItemController overrides:
49 bool IsOpen() const override;
50 bool IsVisible() const override; 49 bool IsVisible() const override;
51 void Launch(ash::LaunchSource source, int event_flags) override; 50 void Launch(ash::LaunchSource source, int event_flags) override;
52 ash::ShelfItemDelegate::PerformedAction Activate( 51 ash::ShelfItemDelegate::PerformedAction Activate(
53 ash::LaunchSource source) override; 52 ash::LaunchSource source) override;
54 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 53 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
55 ash::ShelfItemDelegate::PerformedAction ItemSelected( 54 ash::ShelfItemDelegate::PerformedAction ItemSelected(
56 const ui::Event& event) override; 55 const ui::Event& event) override;
57 base::string16 GetTitle() override; 56 base::string16 GetTitle() override;
58 bool IsDraggable() override; 57 bool IsDraggable() override;
59 bool CanPin() const override; 58 bool CanPin() const override;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // uniquely identify each shelf item that has the same app_id. 110 // uniquely identify each shelf item that has the same app_id.
112 const std::string launch_id_; 111 const std::string launch_id_;
113 112
114 // Scoped list of observed windows (for removal on destruction) 113 // Scoped list of observed windows (for removal on destruction)
115 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 114 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
116 115
117 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController); 116 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
118 }; 117 };
119 118
120 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 119 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698