Revert 235801 "Fix crash when locking a profile. The crash is ha..."

trunk/src/chrome/browser/ui/views/avatar_menu_bubble_view.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 "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/page_navigator.h"
@@ skipping 623 matching lines @@
   return true;
 }
 
 void AvatarMenuBubbleView::ButtonPressed(views::Button* sender,
                                          const ui::Event& event) {
   if (sender->tag() == IDS_PROFILES_MANAGE_PROFILES_BUTTON) {
     std::string subpage = chrome::kSearchUsersSubPage;
     chrome::ShowSettingsSubPage(browser_, subpage);
     return;
   } else if (sender->tag() == IDS_PROFILES_PROFILE_SIGNOUT_BUTTON) {
-    profiles::LockProfile(browser_->profile());
+    avatar_menu_->BeginSignOut();
     return;
   }
 
   for (size_t i = 0; i < item_views_.size(); ++i) {
     ProfileItemView* item_view = item_views_[i];
     if (sender == item_view) {
       // Clicking on the active profile shouldn't do anything.
       if (!item_view->item().active) {
         avatar_menu_->SwitchToProfile(
             i, ui::DispositionFromEventFlags(event.flags()) == NEW_WINDOW);
@@ skipping 132 matching lines @@
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void AvatarMenuBubbleView::SetBackgroundColors() {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     item_views_[i]->OnHighlightStateChanged();
   }
 }