Commit a51ea457 authored by tfarina@chromium.org's avatar tfarina@chromium.org

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
parent cdc828d2
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
#include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/profiles/profile_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 "chrome/common/url_constants.h"
#include "ui/views/view.h" #include "ui/gfx/size.h"
#include "ui/views/widget/widget.h"
using content::WebContents; using content::WebContents;
using content::WebUIMessageHandler; using content::WebUIMessageHandler;
...@@ -26,10 +25,9 @@ namespace chromeos { ...@@ -26,10 +25,9 @@ namespace chromeos {
// static // static
void ChooseMobileNetworkDialog::ShowDialog(gfx::NativeWindow owning_window) { void ChooseMobileNetworkDialog::ShowDialog(gfx::NativeWindow owning_window) {
views::Widget::CreateWindowWithParent( chrome::ShowWebDialog(owning_window,
new WebDialogView(ProfileManager::GetDefaultProfileOrOffTheRecord(), ProfileManager::GetDefaultProfileOrOffTheRecord(),
new ChooseMobileNetworkDialog), new ChooseMobileNetworkDialog);
owning_window)->Show();
} }
ChooseMobileNetworkDialog::ChooseMobileNetworkDialog() { ChooseMobileNetworkDialog::ChooseMobileNetworkDialog() {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/profiles/profile_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 "content/public/browser/notification_source.h" #include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h" #include "content/public/browser/notification_types.h"
#include "ui/gfx/native_widget_types.h" #include "ui/gfx/native_widget_types.h"
...@@ -56,9 +56,9 @@ LoginWebDialog::~LoginWebDialog() { ...@@ -56,9 +56,9 @@ LoginWebDialog::~LoginWebDialog() {
} }
void LoginWebDialog::Show() { void LoginWebDialog::Show() {
views::Widget::CreateWindowWithParent( chrome::ShowWebDialog(parent_window_,
new WebDialogView(ProfileManager::GetDefaultProfile(), this), ProfileManager::GetDefaultProfile(),
parent_window_)->Show(); this);
is_open_ = true; is_open_ = true;
} }
......
...@@ -7,10 +7,9 @@ ...@@ -7,10 +7,9 @@
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/profiles/profile_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 "chrome/common/url_constants.h"
#include "ui/views/view.h" #include "ui/gfx/size.h"
#include "ui/views/widget/widget.h"
using content::WebContents; using content::WebContents;
using content::WebUIMessageHandler; using content::WebUIMessageHandler;
...@@ -45,10 +44,9 @@ namespace chromeos { ...@@ -45,10 +44,9 @@ namespace chromeos {
// static // static
void SimDialogDelegate::ShowDialog(gfx::NativeWindow owning_window, void SimDialogDelegate::ShowDialog(gfx::NativeWindow owning_window,
SimDialogMode mode) { SimDialogMode mode) {
views::Widget::CreateWindowWithParent( chrome::ShowWebDialog(owning_window,
new WebDialogView(ProfileManager::GetDefaultProfileOrOffTheRecord(), ProfileManager::GetDefaultProfileOrOffTheRecord(),
new SimDialogDelegate(mode)), new SimDialogDelegate(mode));
owning_window)->Show();
} }
SimDialogDelegate::SimDialogDelegate(SimDialogMode dialog_mode) SimDialogDelegate::SimDialogDelegate(SimDialogMode dialog_mode)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment