Pass shelf instances, not root windows, for ash context menus.

ash/shelf/shelf_alignment_menu.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/shelf/shelf_alignment_menu.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
-ShelfAlignmentMenu::ShelfAlignmentMenu(aura::Window* root)
-    : ui::SimpleMenuModel(NULL),
-      root_window_(root) {
-  DCHECK(root_window_);
+ShelfAlignmentMenu::ShelfAlignmentMenu(Shelf* shelf)
+    : ui::SimpleMenuModel(nullptr), shelf_(shelf) {
+  DCHECK(shelf_);
   int align_group_id = 1;
   set_delegate(this);
   AddRadioItemWithStringId(MENU_ALIGN_LEFT,
                            IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT,
                            align_group_id);
   AddRadioItemWithStringId(MENU_ALIGN_BOTTOM,
                            IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM,
                            align_group_id);
   AddRadioItemWithStringId(MENU_ALIGN_RIGHT,
                            IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_RIGHT,
                            align_group_id);
 }
 
 ShelfAlignmentMenu::~ShelfAlignmentMenu() {}
 
 bool ShelfAlignmentMenu::IsCommandIdChecked(int command_id) const {
-  return Shelf::ForWindow(root_window_)
-      ->SelectValueForShelfAlignment(MENU_ALIGN_BOTTOM == command_id,
-                                     MENU_ALIGN_LEFT == command_id,
-                                     MENU_ALIGN_RIGHT == command_id, false);
+  return shelf_->SelectValueForShelfAlignment(
+      MENU_ALIGN_BOTTOM == command_id, MENU_ALIGN_LEFT == command_id,
+      MENU_ALIGN_RIGHT == command_id, false);
 }
 
 bool ShelfAlignmentMenu::IsCommandIdEnabled(int command_id) const {
   return true;
 }
 
 bool ShelfAlignmentMenu::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
 void ShelfAlignmentMenu::ExecuteCommand(int command_id, int event_flags) {
+  aura::Window* root_window =
+      shelf_->shelf_widget()->GetNativeWindow()->GetRootWindow();
+  Shell* shell = Shell::GetInstance();
   switch (static_cast<MenuItem>(command_id)) {
     case MENU_ALIGN_LEFT:
-      Shell::GetInstance()->metrics()->
-          RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_LEFT);
-      Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_LEFT,
-                                              root_window_);
+      shell->metrics()->RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_LEFT);
+      shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, root_window);

[msw, 2016/03/17 19:04:37]

Shell::SetShelfAlignment triggers ShellObserver::OnShelfAlignmentChanged.
We should improve that pattern, but probably not in this CL.

       break;
     case MENU_ALIGN_BOTTOM:
-      Shell::GetInstance()->metrics()->
-          RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_BOTTOM);
-      Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM,
-                                              root_window_);
+      shell->metrics()->RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_BOTTOM);
+      shell->SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM, root_window);
       break;
     case MENU_ALIGN_RIGHT:
-      Shell::GetInstance()->metrics()->
-          RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_RIGHT);
-      Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT,
-                                              root_window_);
+      shell->metrics()->RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_RIGHT);
+      shell->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT, root_window);
       break;
   }
 }
 
 }  // namespace ash