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

Side by Side Diff: ash/wm/overview/window_selector_window.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 animations 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_WINDOW_H_ 5 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_WINDOW_H_
6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_WINDOW_H_ 6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_WINDOW_H_
7 7
8 #include "ash/wm/overview/scoped_transform_overview_window.h" 8 #include "ash/wm/overview/scoped_transform_overview_window.h"
9 #include "ash/wm/overview/window_selector_item.h" 9 #include "ash/wm/overview/window_selector_item.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "ui/gfx/rect.h" 11 #include "ui/gfx/rect.h"
13 #include "ui/views/controls/button/button.h" 12 #include "ui/views/controls/button/button.h"
14 13
15 namespace aura { 14 namespace aura {
16 class Window; 15 class Window;
17 } 16 }
18 17
19 namespace views { 18 namespace views {
20 class Widget; 19 class Widget;
21 } 20 }
(...skipping 13 matching lines...) Expand all
35 virtual bool HasSelectableWindow(const aura::Window* window) OVERRIDE; 34 virtual bool HasSelectableWindow(const aura::Window* window) OVERRIDE;
36 virtual aura::Window* TargetedWindow(const aura::Window* target) OVERRIDE; 35 virtual aura::Window* TargetedWindow(const aura::Window* target) OVERRIDE;
37 virtual void RestoreWindowOnExit(aura::Window* window) OVERRIDE; 36 virtual void RestoreWindowOnExit(aura::Window* window) OVERRIDE;
38 virtual aura::Window* SelectionWindow() OVERRIDE; 37 virtual aura::Window* SelectionWindow() OVERRIDE;
39 virtual void RemoveWindow(const aura::Window* window) OVERRIDE; 38 virtual void RemoveWindow(const aura::Window* window) OVERRIDE;
40 virtual bool empty() const OVERRIDE; 39 virtual bool empty() const OVERRIDE;
41 virtual void PrepareForOverview() OVERRIDE; 40 virtual void PrepareForOverview() OVERRIDE;
42 virtual void SetItemBounds(aura::Window* root_window, 41 virtual void SetItemBounds(aura::Window* root_window,
43 const gfx::Rect& target_bounds, 42 const gfx::Rect& target_bounds,
44 bool animate) OVERRIDE; 43 bool animate) OVERRIDE;
44 virtual base::string16 GetLabelName();
tdanderson 2014/04/10 22:37:12 OVERRIDE
Nina 2014/04/14 16:24:04 Done.
45 45
46 // views::ButtonListener: 46 // views::ButtonListener:
47 virtual void ButtonPressed(views::Button* sender, 47 virtual void ButtonPressed(views::Button* sender,
48 const ui::Event& event) OVERRIDE; 48 const ui::Event& event) OVERRIDE;
49
50 private: 49 private:
51 // Creates the close button window if it does not exist and updates the bounds 50 // Creates the close button window if it does not exist and updates the bounds
52 // to match the window selector item. 51 // to match the window selector item.
53 void UpdateCloseButtonBounds(); 52 void UpdateCloseButtonBounds();
54 53
55 // The window with a scoped transform represented by this selector item. 54 // The window with a scoped transform represented by this selector item.
56 ScopedTransformOverviewWindow transform_window_; 55 ScopedTransformOverviewWindow transform_window_;
57 56
58 // An easy to access close button for the window in this item. 57 // An easy to access close button for the window in this item.
59 scoped_ptr<views::Widget> close_button_; 58 scoped_ptr<views::Widget> close_button_;
60 59
61 DISALLOW_COPY_AND_ASSIGN(WindowSelectorWindow); 60 DISALLOW_COPY_AND_ASSIGN(WindowSelectorWindow);
62 }; 61 };
63 62
64 } // namespace ash 63 } // namespace ash
65 64
66 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_WINDOW_H_ 65 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698