Index: ash/wm/overview/window_selector_item.cc |
diff --git a/ash/wm/overview/window_selector_item.cc b/ash/wm/overview/window_selector_item.cc |
index 9cf029f02b711605379157456861b3c41d3d9d4d..2910864c3c90247fdee78df59c733b0926cda604 100644 |
--- a/ash/wm/overview/window_selector_item.cc |
+++ b/ash/wm/overview/window_selector_item.cc |
@@ -13,7 +13,7 @@ |
#include "ui/aura/window.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/compositor/scoped_layer_animation_settings.h" |
-#include "ui/views/controls/label.h" |
+#include "ui/views/controls/window_label.h" |
#include "ui/views/layout/box_layout.h" |
#include "ui/views/widget/widget.h" |
@@ -42,16 +42,15 @@ views::Widget* CreateWindowLabel(aura::Window* root_window, |
views::Widget* widget = new views::Widget; |
views::Widget::InitParams params; |
params.type = views::Widget::InitParams::TYPE_POPUP; |
- params.can_activate = false; |
+ params.can_activate = true; |
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
params.parent = |
Shell::GetContainer(root_window, ash::kShellWindowId_OverlayContainer); |
params.accept_events = false; |
- params.visible_on_all_workspaces = true; |
tdanderson
2014/04/29 14:46:27
Why are you removing this?
Nina
2014/04/29 18:31:40
Actually, because I don't know how it got there. W
|
widget->set_focus_on_creation(false); |
widget->Init(params); |
- views::Label* label = new views::Label; |
+ views::WindowLabel* label = new views::WindowLabel; |
tdanderson
2014/04/29 14:46:27
I think that introducing a new class is overkill h
|
label->SetEnabledColor(kLabelColor); |
label->SetBackgroundColor(kLabelBackground); |
label->SetShadowColors(kLabelShadow, kLabelShadow); |
@@ -155,7 +154,10 @@ void WindowSelectorItem::UpdateWindowLabels(const gfx::Rect& window_bounds, |
window_label_->GetNativeWindow()->SetBounds(label_bounds); |
} |
} |
+} |
+views::Widget* WindowSelectorItem::get_window_label() { |
+ return window_label_.get(); |
tdanderson
2014/04/29 14:46:27
Since this is a simple accessor, you can move the
Nina
2014/04/29 18:31:40
Done.
|
} |
} // namespace ash |