diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:44:39 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:44:39 +0000 |
commit | e4be2dd25b1883bad7bed358e52e04f01c6e6f78 (patch) | |
tree | 842b39b7ea3547a97e07e2d4dcbb4795020c435c /chrome/browser/printing | |
parent | 6415176be8ad6b36d4adafa1c8e76aa89c5ca17c (diff) | |
download | chromium_src-e4be2dd25b1883bad7bed358e52e04f01c6e6f78.zip chromium_src-e4be2dd25b1883bad7bed358e52e04f01c6e6f78.tar.gz chromium_src-e4be2dd25b1883bad7bed358e52e04f01c6e6f78.tar.bz2 |
Deinline even more destructors.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/5794003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
8 files changed, 39 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 fbd0dc6..fddff26 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -165,19 +165,23 @@ std::string CloudPrintSetupFlow::GetDialogArgs() const { return dialog_start_args_; } -void CloudPrintSetupFlow::OnCloseContents(TabContents* source, - bool* out_close_dialog) { +void CloudPrintSetupFlow::OnCloseContents(TabContents* source, + bool* out_close_dialog) { } -std::wstring CloudPrintSetupFlow::GetDialogTitle() const { +std::wstring CloudPrintSetupFlow::GetDialogTitle() const { return l10n_util::GetString(IDS_CLOUD_PRINT_SETUP_DIALOG_TITLE); } -bool CloudPrintSetupFlow::IsDialogModal() const { +bool CloudPrintSetupFlow::IsDialogModal() const { // We are always modeless. return false; } +bool CloudPrintSetupFlow::ShouldShowDialogTitle() const { + return true; +} + /////////////////////////////////////////////////////////////////////////////// // GaiaAuthConsumer implementation. void CloudPrintSetupFlow::OnClientLoginFailure( 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 14354e3..86077ab 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h @@ -70,7 +70,7 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate, virtual void OnCloseContents(TabContents* source, bool* out_close_dialog); virtual std::wstring GetDialogTitle() const; virtual bool IsDialogModal() const; - virtual bool ShouldShowDialogTitle() const { return true; } + virtual bool ShouldShowDialogTitle() const; // GaiaAuthConsumer implementation. virtual void OnClientLoginFailure( diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc index a19ade2..972f088 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc @@ -126,6 +126,10 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw, SendResponse(request_id, html_bytes); } +std::string CloudPrintSetupSource::GetMimeType(const std::string& path) const { + return "text/html"; +} + std::string CloudPrintSetupSource::GetLocalizedUrl( const std::string& url) const { GURL original_url(url); diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h index 3fa3048..7050c5e 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h @@ -18,9 +18,7 @@ class CloudPrintSetupSource : public ChromeURLDataManager::DataSource { bool is_off_the_record, int request_id); - virtual std::string GetMimeType(const std::string& path) const { - return "text/html"; - } + virtual std::string GetMimeType(const std::string& path) const; static const char kInvalidPasswordHelpUrl[]; static const char kCanNotAccessAccountUrl[]; diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index df9df0f..c67b8f5 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -86,6 +86,14 @@ PrintJobWorker* PrintJob::DetachWorker(PrintJobWorkerOwner* new_owner) { return NULL; } +MessageLoop* PrintJob::message_loop() { + return ui_message_loop_; +} + +const PrintSettings& PrintJob::settings() const { + return settings_; +} + int PrintJob::cookie() const { if (!document_.get()) // Always use an invalid cookie in this case. diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h index e78f1a9..03aacda 100644 --- a/chrome/browser/printing/print_job.h +++ b/chrome/browser/printing/print_job.h @@ -54,8 +54,8 @@ class PrintJob : public PrintJobWorkerOwner, virtual void GetSettingsDone(const PrintSettings& new_settings, PrintingContext::Result result); virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner); - virtual MessageLoop* message_loop() { return ui_message_loop_; } - virtual const PrintSettings& settings() const { return settings_; } + virtual MessageLoop* message_loop(); + virtual const PrintSettings& settings() const; virtual int cookie() const; // DestructionObserver diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc index 7b73d86..87ec00f 100644 --- a/chrome/browser/printing/printer_query.cc +++ b/chrome/browser/printing/printer_query.cc @@ -58,6 +58,18 @@ PrintJobWorker* PrinterQuery::DetachWorker(PrintJobWorkerOwner* new_owner) { return worker_.release(); } +MessageLoop* PrinterQuery::message_loop() { + return io_message_loop_; +} + +const PrintSettings& PrinterQuery::settings() const { + return settings_; +} + +int PrinterQuery::cookie() const { + return cookie_; +} + void PrinterQuery::GetSettings(GetSettingsAskParam ask_user_for_settings, gfx::NativeView parent_view, int expected_page_count, diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h index 470eff7..dc18b1f 100644 --- a/chrome/browser/printing/printer_query.h +++ b/chrome/browser/printing/printer_query.h @@ -36,12 +36,9 @@ class PrinterQuery : public PrintJobWorkerOwner { virtual void GetSettingsDone(const PrintSettings& new_settings, PrintingContext::Result result); virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner); - virtual MessageLoop* message_loop() { - return io_message_loop_; - } - virtual const PrintSettings& settings() const { return settings_; } - - virtual int cookie() const { return cookie_; } + virtual MessageLoop* message_loop(); + virtual const PrintSettings& settings() const; + virtual int cookie() const; // Initializes the printing context. It is fine to call this function multiple // times to reinitialize the settings. |parent_view| parameter's window will |