Change Views menus to consistently use GetNativeTheme for theming.

ui/views/controls/menu/menu_controller.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 1199 matching lines @@
                         ui::MENU_SOURCE_KEYBOARD);
       }
       break;
     }
 
     default:
       break;
   }
 }
 
-MenuController::MenuController(ui::NativeTheme* theme,
-                               bool blocking,
+MenuController::MenuController(bool blocking,
                                internal::MenuControllerDelegate* delegate)
     : blocking_run_(blocking),
       showing_(false),
       exit_type_(EXIT_NONE),
       did_capture_(false),
       result_(NULL),
       accept_event_flags_(0),
       drop_target_(NULL),
       drop_position_(MenuDelegate::DROP_UNKNOWN),
       owner_(NULL),
       possible_drag_(false),
       drag_in_progress_(false),
       did_initiate_drag_(false),
       valid_drop_coordinates_(false),
       last_drop_operation_(MenuDelegate::DROP_UNKNOWN),
       showing_submenu_(false),
       active_mouse_view_id_(ViewStorage::GetInstance()->CreateStorageID()),
       delegate_(delegate),
       message_loop_depth_(0),
-      menu_config_(theme),
       closing_event_time_(base::TimeDelta()),
       menu_start_time_(base::TimeTicks()),
       is_combobox_(false),
       item_selected_by_touch_(false),
       current_mouse_event_target_(nullptr),
       current_mouse_pressed_state_(0),
       message_loop_(MenuMessageLoop::Create()) {
   active_instance_ = this;
 }
 
@@ skipping 474 matching lines @@
 
 void MenuController::BuildMenuItemPath(MenuItemView* item,
                                        std::vector<MenuItemView*>* path) {
   if (!item)
     return;
   BuildMenuItemPath(item->GetParentMenuItem(), path);
   path->push_back(item);
 }
 
 void MenuController::StartShowTimer() {
-  show_timer_.Start(FROM_HERE,
-                    TimeDelta::FromMilliseconds(menu_config_.show_delay),
-                    this, &MenuController::CommitPendingSelection);
+  MenuItemView* item = pending_state_.item ? pending_state_.item : state_.item;
+  show_timer_.Start(
+      FROM_HERE, TimeDelta::FromMilliseconds(item->GetMenuConfig().show_delay),
+      this, &MenuController::CommitPendingSelection);
 }
 
 void MenuController::StopShowTimer() {
   show_timer_.Stop();
 }
 
 void MenuController::StartCancelAllTimer() {
   cancel_all_timer_.Start(FROM_HERE,
                           TimeDelta::FromMilliseconds(kCloseOnExitTime),
                           this, &MenuController::CancelAll);
@@ skipping 737 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views