Merge 100357 - Another attempt to fix crash in clock menu button.

chrome/browser/chromeos/login/webui_login_view.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 "chrome/browser/chromeos/login/webui_login_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/accessibility_util.h"
@@ skipping 102 matching lines @@
       kAccelNameAccessibility;
   accel_map_[views::Accelerator(ui::VKEY_E, false, true, true)] =
       kAccelNameEnrollment;
 
   for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
     AddAccelerator(i->first);
 }
 
 WebUILoginView::~WebUILoginView() {
   if (status_window_)
-    status_window_->Close();
+    status_window_->CloseNow();
   status_window_ = NULL;
 }
 
 void WebUILoginView::Init() {
 
   webui_login_ = new DOMView();
   AddChildView(webui_login_);
   webui_login_->Init(ProfileManager::GetDefaultProfile(), NULL);
   webui_login_->SetVisible(true);
   webui_login_->tab_contents()->set_delegate(this);
@@ skipping 70 matching lines @@
   DCHECK(webui_login_);
   webui_login_->SetBoundsRect(bounds());
 }
 
 void WebUILoginView::ChildPreferredSizeChanged(View* child) {
   Layout();
   SchedulePaint();
 }
 
 Profile* WebUILoginView::GetProfile() const {
-  return ProfileManager::GetDefaultProfile();
+  return NULL;
 }
 
 void WebUILoginView::ExecuteBrowserCommand(int id) const {
 }
 
 bool WebUILoginView::ShouldOpenButtonOptions(
     const views::View* button_view) const {
   if (button_view == status_area_->network_view())
     return true;
 
@@ skipping 126 matching lines @@
                                                         GetFocusManager());
 
   // Make sure error bubble is cleared on keyboard event. This is needed
   // when the focus is inside an iframe.
   WebUI* web_ui = GetWebUI();
   if (web_ui)
     web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
 }
 
 }  // namespace chromeos