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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ash/wm/overview/window_selector_item.h
diff --git a/ash/wm/overview/window_selector_item.h b/ash/wm/overview/window_selector_item.h
index eedf3e1f9153c56f33d0073018cb147bbf2e091a..4fbd9c03c3f34c1efcac0c6f9b6e00f346f07464 100644
--- a/ash/wm/overview/window_selector_item.h
+++ b/ash/wm/overview/window_selector_item.h
@@ -6,12 +6,18 @@
#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/strings/string16.h"
#include "ui/gfx/rect.h"
namespace aura {
class Window;
}
+namespace views {
+class Widget;
+}
+
namespace ash {
// This class represents an item in overview mode. An item can have one or more
@@ -38,7 +44,7 @@ class WindowSelectorItem {
virtual void RestoreWindowOnExit(aura::Window* window) = 0;
// Returns the |window| to activate on selecting of this item.
- virtual aura::Window* SelectionWindow() = 0;
+ 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.
// Removes |window| from this item. Check empty() after calling this to see
// if the entire item is now empty.
@@ -74,6 +80,9 @@ class WindowSelectorItem {
// Sets the bounds used by the selector item's windows.
void set_bounds(const gfx::Rect& bounds) { bounds_ = bounds; }
+ // Creates a label to display under the window selector item.
+ void UpdateWindowLabels(const gfx::Rect& target_bounds);
+
private:
// The root window this item is being displayed on.
aura::Window* root_window_;
@@ -90,6 +99,9 @@ class WindowSelectorItem {
// a window layer for display on another monitor.
bool in_bounds_update_;
+ // Label under the window displaying its active tab name.
+ scoped_ptr<views::Widget> window_label_;
+
DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
};

Powered by Google App Engine
This is Rietveld 408576698