summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 01:09:14 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 01:09:14 +0000
commita51ea457256f8cd7249f9c0c363845371494ac60 (patch)
tree4f80861aa70f1dcda01c26c44fed741cbe65a841
parentcdc828d2181d563498bc752d93d1aa4316a1114a (diff)
downloadchromium_src-a51ea457256f8cd7249f9c0c363845371494ac60.zip
chromium_src-a51ea457256f8cd7249f9c0c363845371494ac60.tar.gz
chromium_src-a51ea457256f8cd7249f9c0c363845371494ac60.tar.bz2
chromeos: Use chrome::ShowWebDialog to avoid depending in web_dialog_view.h
This removes the dependency in chrome/browser/ui/views/web_dialog_view.h from chromeos. BUG=125846 R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10695122 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146019 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/choose_mobile_network_dialog.cc12
-rw-r--r--chrome/browser/chromeos/login/login_web_dialog.cc8
-rw-r--r--chrome/browser/chromeos/sim_dialog_delegate.cc12
3 files changed, 14 insertions, 18 deletions
diff --git a/chrome/browser/chromeos/choose_mobile_network_dialog.cc b/chrome/browser/chromeos/choose_mobile_network_dialog.cc
index beb7a3a0..567d2c6 100644
--- a/chrome/browser/chromeos/choose_mobile_network_dialog.cc
+++ b/chrome/browser/chromeos/choose_mobile_network_dialog.cc
@@ -6,10 +6,9 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/views/web_dialog_view.h"
+#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/url_constants.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/widget.h"
+#include "ui/gfx/size.h"
using content::WebContents;
using content::WebUIMessageHandler;
@@ -26,10 +25,9 @@ namespace chromeos {
// static
void ChooseMobileNetworkDialog::ShowDialog(gfx::NativeWindow owning_window) {
- views::Widget::CreateWindowWithParent(
- new WebDialogView(ProfileManager::GetDefaultProfileOrOffTheRecord(),
- new ChooseMobileNetworkDialog),
- owning_window)->Show();
+ chrome::ShowWebDialog(owning_window,
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ new ChooseMobileNetworkDialog);
}
ChooseMobileNetworkDialog::ChooseMobileNetworkDialog() {
diff --git a/chrome/browser/chromeos/login/login_web_dialog.cc b/chrome/browser/chromeos/login/login_web_dialog.cc
index bfec9e1..6c9c0f2 100644
--- a/chrome/browser/chromeos/login/login_web_dialog.cc
+++ b/chrome/browser/chromeos/login/login_web_dialog.cc
@@ -7,7 +7,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/views/web_dialog_view.h"
+#include "chrome/browser/ui/browser_dialogs.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
#include "ui/gfx/native_widget_types.h"
@@ -56,9 +56,9 @@ LoginWebDialog::~LoginWebDialog() {
}
void LoginWebDialog::Show() {
- views::Widget::CreateWindowWithParent(
- new WebDialogView(ProfileManager::GetDefaultProfile(), this),
- parent_window_)->Show();
+ chrome::ShowWebDialog(parent_window_,
+ ProfileManager::GetDefaultProfile(),
+ this);
is_open_ = true;
}
diff --git a/chrome/browser/chromeos/sim_dialog_delegate.cc b/chrome/browser/chromeos/sim_dialog_delegate.cc
index e13d891..7ca79eae 100644
--- a/chrome/browser/chromeos/sim_dialog_delegate.cc
+++ b/chrome/browser/chromeos/sim_dialog_delegate.cc
@@ -7,10 +7,9 @@
#include "base/stringprintf.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/views/web_dialog_view.h"
+#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/url_constants.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/widget.h"
+#include "ui/gfx/size.h"
using content::WebContents;
using content::WebUIMessageHandler;
@@ -45,10 +44,9 @@ namespace chromeos {
// static
void SimDialogDelegate::ShowDialog(gfx::NativeWindow owning_window,
SimDialogMode mode) {
- views::Widget::CreateWindowWithParent(
- new WebDialogView(ProfileManager::GetDefaultProfileOrOffTheRecord(),
- new SimDialogDelegate(mode)),
- owning_window)->Show();
+ chrome::ShowWebDialog(owning_window,
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ new SimDialogDelegate(mode));
}
SimDialogDelegate::SimDialogDelegate(SimDialogMode dialog_mode)