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

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: Added blurred shadows to labels 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 }
tdanderson 2014/04/14 16:58:39 newline after line 15
Nina 2014/04/14 17:59:17 Done.
16 namespace views {
17 class Widget;
18 }
14 19
15 namespace ash { 20 namespace ash {
16 21
17 // This class represents an item in overview mode. An item can have one or more 22 // 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 23 // 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). 24 // any can be selected with a pointer (touch or mouse).
20 class WindowSelectorItem { 25 class WindowSelectorItem {
21 public: 26 public:
22 WindowSelectorItem(); 27 WindowSelectorItem();
23 virtual ~WindowSelectorItem(); 28 virtual ~WindowSelectorItem();
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 protected: 72 protected:
68 // Sets the bounds of this selector item to |target_bounds| in |root_window|. 73 // Sets the bounds of this selector item to |target_bounds| in |root_window|.
69 // If |animate| the windows are animated from their current location. 74 // If |animate| the windows are animated from their current location.
70 virtual void SetItemBounds(aura::Window* root_window, 75 virtual void SetItemBounds(aura::Window* root_window,
71 const gfx::Rect& target_bounds, 76 const gfx::Rect& target_bounds,
72 bool animate) = 0; 77 bool animate) = 0;
73 78
74 // Sets the bounds used by the selector item's windows. 79 // Sets the bounds used by the selector item's windows.
75 void set_bounds(const gfx::Rect& bounds) { bounds_ = bounds; } 80 void set_bounds(const gfx::Rect& bounds) { bounds_ = bounds; }
76 81
82 // Creates a label to display under the window selector item.
83 void UpdateWindowLabels(const gfx::Rect& target_bounds);
84
85 // Returns the label name.
86 virtual base::string16 GetLabelName() = 0;
87
77 private: 88 private:
78 // The root window this item is being displayed on. 89 // The root window this item is being displayed on.
79 aura::Window* root_window_; 90 aura::Window* root_window_;
80 91
81 // The target bounds this selector item is fit within. 92 // The target bounds this selector item is fit within.
82 gfx::Rect target_bounds_; 93 gfx::Rect target_bounds_;
83 94
84 // The actual bounds of the window(s) for this item. The aspect ratio of 95 // 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_. 96 // window(s) are maintained so they may not fill the target_bounds_.
86 gfx::Rect bounds_; 97 gfx::Rect bounds_;
87 98
88 // True if running SetItemBounds. This prevents recursive calls resulting from 99 // True if running SetItemBounds. This prevents recursive calls resulting from
89 // the bounds update when calling ::wm::RecreateWindowLayers to copy 100 // the bounds update when calling ::wm::RecreateWindowLayers to copy
90 // a window layer for display on another monitor. 101 // a window layer for display on another monitor.
91 bool in_bounds_update_; 102 bool in_bounds_update_;
92 103
104 // Label under the window with the tab name.
tdanderson 2014/04/14 16:58:39 Specify this is the name of the window's active ta
Nina 2014/04/14 17:59:17 Done.
105 scoped_ptr<views::Widget> window_label_;
106
93 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem); 107 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
94 }; 108 };
95 109
96 } // namespace ash 110 } // namespace ash
97 111
98 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 112 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698