Commit 4aef838c authored by varkha's avatar varkha Committed by Commit bot

[ash-md] Fixes z-order to get context menus above overview items

Changes the parent of search widget labels and close buttons in overview
mode to be kShellWindowId_StatusContainer which is still above all
windows but below menus and screen overlays.

BUG=629039

Review-Url: https://codereview.chromium.org/2154323002
Cr-Commit-Position: refs/heads/master@{#406040}
parent 639fdffb
...@@ -207,7 +207,7 @@ views::Widget* CreateTextFilter(views::TextfieldController* controller, ...@@ -207,7 +207,7 @@ views::Widget* CreateTextFilter(views::TextfieldController* controller,
params.bounds = GetTextFilterPosition(root_window); params.bounds = GetTextFilterPosition(root_window);
*text_filter_bottom = params.bounds.bottom(); *text_filter_bottom = params.bounds.bottom();
root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer( root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
widget, kShellWindowId_OverlayContainer, &params); widget, kShellWindowId_StatusContainer, &params);
widget->Init(params); widget->Init(params);
// Use |container| to specify the padding surrounding the text and to give // Use |container| to specify the padding surrounding the text and to give
......
...@@ -294,7 +294,7 @@ WindowSelectorItem::WindowSelectorItem(WmWindow* window, ...@@ -294,7 +294,7 @@ WindowSelectorItem::WindowSelectorItem(WmWindow* window,
close_button_widget_.reset(new views::Widget); close_button_widget_.reset(new views::Widget);
close_button_widget_->set_focus_on_creation(false); close_button_widget_->set_focus_on_creation(false);
window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer( window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
close_button_widget_.get(), kShellWindowId_OverlayContainer, &params); close_button_widget_.get(), kShellWindowId_StatusContainer, &params);
close_button_widget_->Init(params); close_button_widget_->Init(params);
close_button_->SetVisible(false); close_button_->SetVisible(false);
close_button_widget_->SetContentsView(close_button_); close_button_widget_->SetContentsView(close_button_);
...@@ -534,7 +534,7 @@ void WindowSelectorItem::CreateWindowLabel(const base::string16& title) { ...@@ -534,7 +534,7 @@ void WindowSelectorItem::CreateWindowLabel(const base::string16& title) {
window_label_->set_focus_on_creation(false); window_label_->set_focus_on_creation(false);
root_window_->GetRootWindowController() root_window_->GetRootWindowController()
->ConfigureWidgetInitParamsForContainer( ->ConfigureWidgetInitParamsForContainer(
window_label_.get(), kShellWindowId_OverlayContainer, &params); window_label_.get(), kShellWindowId_StatusContainer, &params);
window_label_->Init(params); window_label_->Init(params);
window_label_button_view_ = new OverviewLabelButton(this, title); window_label_button_view_ = new OverviewLabelButton(this, title);
window_label_button_view_->SetBorder(views::Border::NullBorder()); window_label_button_view_->SetBorder(views::Border::NullBorder());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment