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

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

Issue 2627533002: Replace ShelfItemDelegate::GetTitle() with ShelfItem::title. (Closed)
Patch Set: Address comments. Created 3 years, 11 months 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ui::BaseWindow* GetAppWindow(aura::Window* window); 43 ui::BaseWindow* GetAppWindow(aura::Window* window);
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;
54 void Close() override; 53 void Close() override;
55 54
56 // aura::WindowObserver overrides: 55 // aura::WindowObserver overrides:
57 void OnWindowPropertyChanged(aura::Window* window, 56 void OnWindowPropertyChanged(aura::Window* window,
58 const void* key, 57 const void* key,
59 intptr_t old) override; 58 intptr_t old) override;
60 59
61 // Get the number of running applications/incarnations of this. 60 // Get the number of running applications/incarnations of this.
62 size_t window_count() const { return windows_.size(); } 61 size_t window_count() const { return windows_.size(); }
63 62
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // Pointer to the most recently active app window 94 // Pointer to the most recently active app window
96 ui::BaseWindow* last_active_window_ = nullptr; 95 ui::BaseWindow* last_active_window_ = nullptr;
97 96
98 // Scoped list of observed windows (for removal on destruction) 97 // Scoped list of observed windows (for removal on destruction)
99 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 98 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
100 99
101 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController); 100 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
102 }; 101 };
103 102
104 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 103 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698