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

Side by Side Diff: ash/wm/overview/window_selector_item.h

Issue 231643002: Added labels under the windows in OverviewMode displaying their current name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactored the code to take advantage of blur mechanics, minor fixes Created 6 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 5 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string16.h"
9 #include "ui/gfx/rect.h" 11 #include "ui/gfx/rect.h"
10 12
11 namespace aura { 13 namespace aura {
12 class Window; 14 class Window;
13 } 15 }
14 16
17 namespace views {
18 class Widget;
19 }
20
15 namespace ash { 21 namespace ash {
16 22
17 // This class represents an item in overview mode. An item can have one or more 23 // This class represents an item in overview mode. An item can have one or more
18 // windows, of which only one can be activated by keyboard (i.e. alt+tab) but 24 // windows, of which only one can be activated by keyboard (i.e. alt+tab) but
19 // any can be selected with a pointer (touch or mouse). 25 // any can be selected with a pointer (touch or mouse).
20 class WindowSelectorItem { 26 class WindowSelectorItem {
21 public: 27 public:
22 WindowSelectorItem(); 28 WindowSelectorItem();
23 virtual ~WindowSelectorItem(); 29 virtual ~WindowSelectorItem();
24 30
25 // Returns the root window on which this item is shown. 31 // Returns the root window on which this item is shown.
26 virtual aura::Window* GetRootWindow() = 0; 32 virtual aura::Window* GetRootWindow() = 0;
27 33
28 // Returns true if the window selector item has |window| as a selectable 34 // Returns true if the window selector item has |window| as a selectable
29 // window. 35 // window.
30 virtual bool HasSelectableWindow(const aura::Window* window) = 0; 36 virtual bool HasSelectableWindow(const aura::Window* window) = 0;
31 37
32 // Returns the targeted window given the event |target| window. 38 // Returns the targeted window given the event |target| window.
33 // Returns NULL if no Window in this item was selected. 39 // Returns NULL if no Window in this item was selected.
34 virtual aura::Window* TargetedWindow(const aura::Window* target) = 0; 40 virtual aura::Window* TargetedWindow(const aura::Window* target) = 0;
35 41
36 // Restores |window| on exiting window overview rather than returning it 42 // Restores |window| on exiting window overview rather than returning it
37 // to its previous state. 43 // to its previous state.
38 virtual void RestoreWindowOnExit(aura::Window* window) = 0; 44 virtual void RestoreWindowOnExit(aura::Window* window) = 0;
39 45
40 // Returns the |window| to activate on selecting of this item. 46 // Returns the |window| to activate on selecting of this item.
41 virtual aura::Window* SelectionWindow() = 0; 47 virtual aura::Window* SelectionWindow() const = 0;
flackr 2014/04/16 02:37:10 I think in general const functions should return c
Nina 2014/04/16 18:19:12 Done.
42 48
43 // Removes |window| from this item. Check empty() after calling this to see 49 // Removes |window| from this item. Check empty() after calling this to see
44 // if the entire item is now empty. 50 // if the entire item is now empty.
45 virtual void RemoveWindow(const aura::Window* window) = 0; 51 virtual void RemoveWindow(const aura::Window* window) = 0;
46 52
47 // Returns true if this item has no more selectable windows (i.e. after 53 // Returns true if this item has no more selectable windows (i.e. after
48 // calling RemoveWindow for the last contained window). 54 // calling RemoveWindow for the last contained window).
49 virtual bool empty() const = 0; 55 virtual bool empty() const = 0;
50 56
51 // Dispatched before beginning window overview. This will do any necessary 57 // Dispatched before beginning window overview. This will do any necessary
(...skipping 15 matching lines...) Expand all
67 protected: 73 protected:
68 // Sets the bounds of this selector item to |target_bounds| in |root_window|. 74 // Sets the bounds of this selector item to |target_bounds| in |root_window|.
69 // If |animate| the windows are animated from their current location. 75 // If |animate| the windows are animated from their current location.
70 virtual void SetItemBounds(aura::Window* root_window, 76 virtual void SetItemBounds(aura::Window* root_window,
71 const gfx::Rect& target_bounds, 77 const gfx::Rect& target_bounds,
72 bool animate) = 0; 78 bool animate) = 0;
73 79
74 // Sets the bounds used by the selector item's windows. 80 // Sets the bounds used by the selector item's windows.
75 void set_bounds(const gfx::Rect& bounds) { bounds_ = bounds; } 81 void set_bounds(const gfx::Rect& bounds) { bounds_ = bounds; }
76 82
83 // Creates a label to display under the window selector item.
84 void UpdateWindowLabels(const gfx::Rect& target_bounds);
85
77 private: 86 private:
78 // The root window this item is being displayed on. 87 // The root window this item is being displayed on.
79 aura::Window* root_window_; 88 aura::Window* root_window_;
80 89
81 // The target bounds this selector item is fit within. 90 // The target bounds this selector item is fit within.
82 gfx::Rect target_bounds_; 91 gfx::Rect target_bounds_;
83 92
84 // The actual bounds of the window(s) for this item. The aspect ratio of 93 // The actual bounds of the window(s) for this item. The aspect ratio of
85 // window(s) are maintained so they may not fill the target_bounds_. 94 // window(s) are maintained so they may not fill the target_bounds_.
86 gfx::Rect bounds_; 95 gfx::Rect bounds_;
87 96
88 // True if running SetItemBounds. This prevents recursive calls resulting from 97 // True if running SetItemBounds. This prevents recursive calls resulting from
89 // the bounds update when calling ::wm::RecreateWindowLayers to copy 98 // the bounds update when calling ::wm::RecreateWindowLayers to copy
90 // a window layer for display on another monitor. 99 // a window layer for display on another monitor.
91 bool in_bounds_update_; 100 bool in_bounds_update_;
92 101
102 // Label under the window displaying its active tab name.
103 scoped_ptr<views::Widget> window_label_;
104
93 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem); 105 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
94 }; 106 };
95 107
96 } // namespace ash 108 } // namespace ash
97 109
98 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 110 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698