views: Create update recommended dialog inside the Show() function.

chrome/browser/ui/views/update_recommended_message_box.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/update_recommended_message_box.h"
 
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/dialog_style.h"
-#include "chrome/browser/ui/views/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #endif
 
+namespace {
+
+#if defined(OS_CHROMEOS)

[Peter Kasting, 2012/04/13 21:45:37]

Nit: I think defining these in the function body (as before) is better when
they're only used in one place.

+const int kProductNameID = IDS_PRODUCT_OS_NAME;
+#else
+const int kProductNameID = IDS_PRODUCT_NAME;
+#endif
+
+const int kDialogWidth = 400;
+
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // UpdateRecommendedMessageBox, public:
 
 // static
-void UpdateRecommendedMessageBox::ShowMessageBox(
-    gfx::NativeWindow parent_window) {
+void UpdateRecommendedMessageBox::Show(gfx::NativeWindow parent_window) {
   // When the window closes, it will delete itself.
-  new UpdateRecommendedMessageBox(parent_window);
+  UpdateRecommendedMessageBox* window = new UpdateRecommendedMessageBox;

[Peter Kasting, 2012/04/13 21:45:37]

Nit: Can inline into the next line.

I also suggest adding "()" to the classname when constructing, although there's
no style rule about this.

+  views::Widget::CreateWindowWithParent(window, parent_window)->Show();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// UpdateRecommendedMessageBox, private:
+
+UpdateRecommendedMessageBox::UpdateRecommendedMessageBox() {
+  const string16 product_name = l10n_util::GetStringUTF16(kProductNameID);
+  // Also deleted when the window closes.
+  message_box_view_ = new views::MessageBoxView(
+      views::MessageBoxView::NO_OPTIONS,
+      l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED, product_name),
+      string16(),
+      kDialogWidth);
+}
+
+UpdateRecommendedMessageBox::~UpdateRecommendedMessageBox() {
 }
 
 bool UpdateRecommendedMessageBox::Accept() {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
   // If running the Chrome OS build, but we're not on the device, fall through
 #endif
   BrowserList::AttemptRestart();
   return true;
 }
@@ skipping 28 matching lines @@
   return message_box_view_;
 }
 
 views::Widget* UpdateRecommendedMessageBox::GetWidget() {
   return message_box_view_->GetWidget();
 }
 
 const views::Widget* UpdateRecommendedMessageBox::GetWidget() const {
   return message_box_view_->GetWidget();
 }
-
-////////////////////////////////////////////////////////////////////////////////
-// UpdateRecommendedMessageBox, private:
-
-UpdateRecommendedMessageBox::UpdateRecommendedMessageBox(
-    gfx::NativeWindow parent_window) {
-  const int kDialogWidth = 400;
-#if defined(OS_CHROMEOS)
-  const int kProductNameId = IDS_PRODUCT_OS_NAME;
-#else
-  const int kProductNameId = IDS_PRODUCT_NAME;
-#endif
-  const string16 product_name = l10n_util::GetStringUTF16(kProductNameId);
-  // Also deleted when the window closes.
-  message_box_view_ = new views::MessageBoxView(
-      views::MessageBoxView::NO_OPTIONS,
-      l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED, product_name),
-      string16(),
-      kDialogWidth);
-  views::Widget::CreateWindowWithParent(this, parent_window)->Show();
-}
-
-UpdateRecommendedMessageBox::~UpdateRecommendedMessageBox() {
-}