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

ash/common/wm/overview/window_selector_item.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm/overview/window_selector_item.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 273 matching lines @@
       window_selector_(window_selector) {
   CreateWindowLabel(window->GetTitle());
   if (!ash::MaterialDesignController::IsOverviewMaterial()) {
     views::Widget::InitParams params;
     params.type = views::Widget::InitParams::TYPE_POPUP;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
     close_button_widget_.reset(new views::Widget);
     close_button_widget_->set_focus_on_creation(false);
     window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
-        close_button_widget_.get(), kShellWindowId_OverlayContainer, &params);
+        close_button_widget_.get(), kShellWindowId_StatusContainer, &params);
     close_button_widget_->Init(params);
     close_button_->SetVisible(false);
     close_button_widget_->SetContentsView(close_button_);
     close_button_widget_->SetSize(close_button_->GetPreferredSize());
     close_button_widget_->Show();
 
     gfx::Rect close_button_rect(close_button_->GetPreferredSize());
     // Align the center of the button with position (0, 0) so that the
     // translate transform does not need to take the button dimensions into
     // account.
@@ skipping 204 matching lines @@
   const bool material = ash::MaterialDesignController::IsOverviewMaterial();
   window_label_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_POPUP;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.visible_on_all_workspaces = true;
   window_label_->set_focus_on_creation(false);
   root_window_->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
-          window_label_.get(), kShellWindowId_OverlayContainer, &params);
+          window_label_.get(), kShellWindowId_StatusContainer, &params);
   window_label_->Init(params);
   window_label_button_view_ = new OverviewLabelButton(this, title);
   window_label_button_view_->SetBorder(views::Border::NullBorder());
   window_label_button_view_->SetEnabledTextColors(kLabelColor);
   window_label_button_view_->set_animate_on_state_change(false);
   if (material) {
     window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   } else {
     window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     window_label_button_view_->SetTextShadows(gfx::ShadowValues(
@@ skipping 109 matching lines @@
   window_label_selector_window->SetOpacity(opacity);
 }
 
 void WindowSelectorItem::UpdateCloseButtonAccessibilityName() {
   close_button_->SetAccessibleName(l10n_util::GetStringFUTF16(
       IDS_ASH_OVERVIEW_CLOSE_ITEM_BUTTON_ACCESSIBLE_NAME,
       GetWindow()->GetTitle()));
 }
 
 }  // namespace ash