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

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

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)
Patch Set: fix mac compile Created 3 years, 6 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 void OnWindowPropertyChanged(aura::Window* window, 53 void OnWindowPropertyChanged(aura::Window* window,
54 const void* key, 54 const void* key,
55 intptr_t old) override; 55 intptr_t old) override;
56 56
57 // Get the number of running applications/incarnations of this. 57 // Get the number of running applications/incarnations of this.
58 size_t window_count() const { return windows_.size(); } 58 size_t window_count() const { return windows_.size(); }
59 59
60 // Activates the window at position |index|. 60 // Activates the window at position |index|.
61 void ActivateIndexedApp(size_t index); 61 void ActivateIndexedApp(size_t index);
62 62
63 // Called when launcher item may need to be updated, eg. label or icon.
64 // TODO(khmel): Use aura::Window property and observe property change
65 // http://crbug.com/724292
66 virtual void UpdateLauncherItem() {}
67
68 const WindowList& windows() const { return windows_; } 63 const WindowList& windows() const { return windows_; }
69 64
70 protected: 65 protected:
71 explicit AppWindowLauncherItemController(const ash::ShelfID& shelf_id); 66 explicit AppWindowLauncherItemController(const ash::ShelfID& shelf_id);
72 67
73 // Returns the action performed. Should be one of SHELF_ACTION_NONE, 68 // Returns the action performed. Should be one of SHELF_ACTION_NONE,
74 // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED. 69 // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED.
75 ash::ShelfAction ShowAndActivateOrMinimize(ui::BaseWindow* window); 70 ash::ShelfAction ShowAndActivateOrMinimize(ui::BaseWindow* window);
76 71
77 // Activate the given |window_to_show|, or - if already selected - advance to 72 // Activate the given |window_to_show|, or - if already selected - advance to
78 // the next window of similar type. 73 // the next window of similar type.
79 // Returns the action performed. Should be one of SHELF_ACTION_NONE, 74 // Returns the action performed. Should be one of SHELF_ACTION_NONE,
80 // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED. 75 // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED.
81 ash::ShelfAction ActivateOrAdvanceToNextAppWindow( 76 ash::ShelfAction ActivateOrAdvanceToNextAppWindow(
82 ui::BaseWindow* window_to_show); 77 ui::BaseWindow* window_to_show);
83 78
84 // Returns last active window in the controller or first window. 79 // Returns last active window in the controller or first window.
85 ui::BaseWindow* GetLastActiveWindow(); 80 ui::BaseWindow* GetLastActiveWindow();
86 81
87 private: 82 private:
88 WindowList::iterator GetFromNativeWindow(aura::Window* window); 83 WindowList::iterator GetFromNativeWindow(aura::Window* window);
89 84
85 // Handles the case when the app window in this controller has been changed,
86 // and sets the new controller icon based on the currently active window.
87 void UpdateShelfItemIcon();
88
90 // List of associated app windows 89 // List of associated app windows
91 WindowList windows_; 90 WindowList windows_;
92 91
93 // Pointer to the most recently active app window 92 // Pointer to the most recently active app window
94 // TODO(khmel): Get rid of |last_active_window_| and provide more reliable 93 // TODO(khmel): Get rid of |last_active_window_| and provide more reliable
95 // way to determine active window. 94 // way to determine active 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
« no previous file with comments | « chrome/browser/ui/apps/chrome_app_delegate.cc ('k') | chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698