Change status button menu implementation from Menu2 to MenuItemView.

views/controls/menu/menu_controller.cc

 // Copyright (c) 2011 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 "views/controls/menu/menu_controller.h"
 
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
@@ skipping 285 matching lines @@
 
   if (!blocking_run_) {
     // Start the timer to hide the menu. This is needed as we get no
     // notification when the drag has finished.
     StartCancelAllTimer();
     return NULL;
   } else if (button) {
     menu_button_ = button;
   }
 
-  // Make sure Chrome doesn't attempt to shut down while the menu is showing.
+  // Make sure Chrome doesn't attempt to shut down while the menu is
+  // showing.  We don't ref and unref the ViewsDelegate for ChromeOS
+  // because this will exit the message loop if no browsers exist,
+  // (e.g. on the login screen).
+#if !defined(OS_CHROMEOS)

[oshima, 2011/04/14 17:27:31]

This looks suspicious. Let's discuss offline.

[rhashimoto, 2011/04/14 18:27:04]

Sounds like a good idea.

[rhashimoto, 2011/04/15 21:20:27]

Reverted to original file.  The login screen should maintain a reference count
on the message loop.

   if (ViewsDelegate::views_delegate)
-    ViewsDelegate::views_delegate->AddRef();
+      ViewsDelegate::views_delegate->AddRef();
+#endif
 
   // We need to turn on nestable tasks as in some situations (pressing alt-f for
   // one) the menus are run from a task. If we don't do this and are invoked
   // from a task none of the tasks we schedule are processed and the menu
   // appears totally broken.
   MessageLoopForUI* loop = MessageLoopForUI::current();
   bool did_allow_task_nesting = loop->NestableTasksAllowed();
   loop->SetNestableTasksAllowed(true);
   loop->Run(this);
   loop->SetNestableTasksAllowed(did_allow_task_nesting);
 
+#if !defined(OS_CHROMEOS)
   if (ViewsDelegate::views_delegate)
     ViewsDelegate::views_delegate->ReleaseRef();
+#endif
 
   // Close any open menus.
   SetSelection(NULL, SELECTION_UPDATE_IMMEDIATELY | SELECTION_EXIT);
 
   if (nested_menu) {
     DCHECK(!menu_stack_.empty());
     // We're running from within a menu, restore the previous state.
     // The menus are already showing, so we don't have to show them.
     state_ = menu_stack_.back();
     pending_state_ = menu_stack_.back();
@@ skipping 1513 matching lines @@
     return;
 
   // Reset the active_mouse_view_ before sending mouse capture lost. That way if
   // it calls back to us, we aren't in a weird state.
   View* active_view = active_mouse_view_;
   active_mouse_view_ = NULL;
   active_view->OnMouseCaptureLost();
 }
 
 }  // namespace views