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

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

Issue 2558963002: Move shelf item tooltip flag from delegate to item. (Closed)
Patch Set: Remove WmWindowMus::SetBoolProperty override. 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
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; 54 bool IsDraggable() override;
55 bool CanPin() const override; 55 bool CanPin() const override;
56 bool ShouldShowTooltip() override;
57 void Close() override; 56 void Close() override;
58 57
59 // aura::WindowObserver overrides: 58 // aura::WindowObserver overrides:
60 void OnWindowPropertyChanged(aura::Window* window, 59 void OnWindowPropertyChanged(aura::Window* window,
61 const void* key, 60 const void* key,
62 intptr_t old) override; 61 intptr_t old) override;
63 62
64 // Get the number of running applications/incarnations of this. 63 // Get the number of running applications/incarnations of this.
65 size_t window_count() const { return windows_.size(); } 64 size_t window_count() const { return windows_.size(); }
66 65
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // Pointer to the most recently active app window 97 // Pointer to the most recently active app window
99 ui::BaseWindow* last_active_window_ = nullptr; 98 ui::BaseWindow* last_active_window_ = nullptr;
100 99
101 // Scoped list of observed windows (for removal on destruction) 100 // Scoped list of observed windows (for removal on destruction)
102 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 101 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
103 102
104 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController); 103 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
105 }; 104 };
106 105
107 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 106 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698