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

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

Issue 2575613002: Remove ShelfItemDelegate::IsDraggable; check for app list button. (Closed)
Patch Set: Address comments. Created 4 years 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 // LauncherItemController overrides: 45 // LauncherItemController overrides:
46 bool IsVisible() const override; 46 bool IsVisible() const override;
47 void Launch(ash::LaunchSource source, int event_flags) override; 47 void Launch(ash::LaunchSource source, int event_flags) override;
48 ash::ShelfItemDelegate::PerformedAction Activate( 48 ash::ShelfItemDelegate::PerformedAction Activate(
49 ash::LaunchSource source) override; 49 ash::LaunchSource source) override;
50 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 50 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
51 ash::ShelfItemDelegate::PerformedAction ItemSelected( 51 ash::ShelfItemDelegate::PerformedAction ItemSelected(
52 const ui::Event& event) override; 52 const ui::Event& event) override;
53 base::string16 GetTitle() override; 53 base::string16 GetTitle() override;
54 bool IsDraggable() override;
55 bool CanPin() const override; 54 bool CanPin() const override;
56 void Close() override; 55 void Close() override;
57 56
58 // aura::WindowObserver overrides: 57 // aura::WindowObserver overrides:
59 void OnWindowPropertyChanged(aura::Window* window, 58 void OnWindowPropertyChanged(aura::Window* window,
60 const void* key, 59 const void* key,
61 intptr_t old) override; 60 intptr_t old) override;
62 61
63 // Get the number of running applications/incarnations of this. 62 // Get the number of running applications/incarnations of this.
64 size_t window_count() const { return windows_.size(); } 63 size_t window_count() const { return windows_.size(); }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // Pointer to the most recently active app window 96 // Pointer to the most recently active app window
98 ui::BaseWindow* last_active_window_ = nullptr; 97 ui::BaseWindow* last_active_window_ = nullptr;
99 98
100 // Scoped list of observed windows (for removal on destruction) 99 // Scoped list of observed windows (for removal on destruction)
101 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 100 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
102 101
103 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController); 102 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
104 }; 103 };
105 104
106 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 105 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698