| Index: chrome/browser/ui/views/update_recommended_message_box.cc
|
| diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc
|
| index 39fd38ce46ac4aae3aca4ff2dc904a45506558dd..981cd22fe8a13f3410b5b94b04a30ef9ae90b214 100644
|
| --- a/chrome/browser/ui/views/update_recommended_message_box.cc
|
| +++ b/chrome/browser/ui/views/update_recommended_message_box.cc
|
| @@ -4,11 +4,7 @@
|
|
|
| #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"
|
| @@ -16,7 +12,6 @@
|
| #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
|
| @@ -25,10 +20,32 @@
|
| // 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);
|
| + views::Widget::CreateWindowWithParent(new UpdateRecommendedMessageBox(),
|
| + parent_window)->Show();
|
| +}
|
| +
|
| +////////////////////////////////////////////////////////////////////////////////
|
| +// UpdateRecommendedMessageBox, private:
|
| +
|
| +UpdateRecommendedMessageBox::UpdateRecommendedMessageBox() {
|
| + 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);
|
| +}
|
| +
|
| +UpdateRecommendedMessageBox::~UpdateRecommendedMessageBox() {
|
| }
|
|
|
| bool UpdateRecommendedMessageBox::Accept() {
|
| @@ -77,27 +94,3 @@ views::Widget* UpdateRecommendedMessageBox::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() {
|
| -}
|
|
|