diff options
Diffstat (limited to 'chrome/browser/printing')
3 files changed, 4 insertions, 16 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index 8e36e31..8d7f81f 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -22,7 +22,6 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/web_dialog_controller.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/gaia/google_service_auth_error.h" @@ -80,22 +79,20 @@ CloudPrintSetupFlow* CloudPrintSetupFlow::OpenDialog( base::JSONWriter::Write(&args, &json_args); CloudPrintSetupFlow* flow = new CloudPrintSetupFlow(json_args, profile, - browser, delegate, - setup_done); + delegate, setup_done); // We may not always have a browser. This can happen when we are being // invoked in the context of a "token expired" notfication. If we don't have // a brower, use the underlying dialog system to show the dialog without // using a browser. if (!parent_window && browser && browser->window()) parent_window = browser->window()->GetNativeHandle(); - browser::ShowWebDialog(parent_window, profile, flow); + browser::ShowWebDialog(parent_window, profile, browser, flow); return flow; } CloudPrintSetupFlow::CloudPrintSetupFlow( const std::string& args, Profile* profile, - Browser* browser, const base::WeakPtr<Delegate>& delegate, bool setup_done) : web_ui_(NULL), @@ -106,10 +103,6 @@ CloudPrintSetupFlow::CloudPrintSetupFlow( delegate_(delegate) { // TODO(hclam): The data source should be added once. profile_ = profile; - if (browser) { - web_dialog_controller_.reset( - new WebDialogController(this, profile, browser)); - } ChromeURLDataManager::AddDataSource(profile, new CloudPrintSetupSource()); } diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h index 698a444..a1bf990 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h @@ -18,7 +18,6 @@ #include "ui/gfx/native_widget_types.h" #include "ui/web_dialogs/web_dialog_delegate.h" -class Browser; class CloudPrintServiceProcessHelper; class CloudPrintSetupMessageHandler; class GaiaAuthFetcher; @@ -34,8 +33,6 @@ namespace content { class WebUI; } -class WebDialogController; - // This class is responsible for showing a cloud print setup dialog // and perform operations to fill the content of the dialog and handle // user actions in the dialog. @@ -101,9 +98,7 @@ class CloudPrintSetupFlow : public ui::WebDialogDelegate, friend class CloudPrintSetupMessageHandler; // Use static Run method to get an instance. - CloudPrintSetupFlow(const std::string& args, - Profile* profile, - Browser* browser, + CloudPrintSetupFlow(const std::string& args, Profile* profile, const base::WeakPtr<Delegate>& delegate, bool setup_done); // Called CloudPrintSetupMessageHandler when a DOM is attached. This method @@ -154,7 +149,6 @@ class CloudPrintSetupFlow : public ui::WebDialogDelegate, // Handle to the ServiceProcessControl which talks to the service process. ServiceProcessControl* process_control_; base::WeakPtr<Delegate> delegate_; - scoped_ptr<WebDialogController> web_dialog_controller_; DISALLOW_COPY_AND_ASSIGN(CloudPrintSetupFlow); }; diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 7d38636..1e37cdc 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -684,6 +684,7 @@ void CreateDialogImpl(content::BrowserContext* browser_context, callback); browser::ShowWebDialog(modal_parent, Profile::FromBrowserContext(browser_context), + NULL, dialog_delegate); } |