summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 19:25:48 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 19:25:48 +0000
commit1ce1597337ec9459598cc84a6bc3831c2ea3dfac (patch)
tree348d72c015790f799959ab9e958d8254c705af5a /chrome/browser/printing
parent998e64060cece98794221895e561970be9a248d0 (diff)
downloadchromium_src-1ce1597337ec9459598cc84a6bc3831c2ea3dfac.zip
chromium_src-1ce1597337ec9459598cc84a6bc3831c2ea3dfac.tar.gz
chromium_src-1ce1597337ec9459598cc84a6bc3831c2ea3dfac.tar.bz2
Split ExtensionWebContentsObserver into base and Chrome implementations
This allows app_shell to use a simplified ExtensionWebContentsObserver while Chrome maintains its more complex version. * Move ExtensionWebContentsObserver to src/extensions * Introduce ChromeExtensionWebContentsObserver * Delegate out observer creation from ExtensionHost Removing this dependency on Chrome will allow ExtensionHost to move into src/extensions and break another app_shell -> Chrome dependency. BUG=321341 TEST=browser_tests ErrorConsole* and Extension* TBR=stevenjb@chromium.org for mechanical changes to chrome/browser/chromeos TBR=msw@chromium.org for mechanical changes to chrome/browser/ui Review URL: https://codereview.chromium.org/205243004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
-rw-r--r--chrome/browser/printing/print_preview_dialog_controller.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc
index 04df1a9..a7c9636 100644
--- a/chrome/browser/printing/print_preview_dialog_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -12,7 +12,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/extension_web_contents_observer.h"
+#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/profiles/profile.h"
@@ -494,7 +494,7 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
WebContents* preview_dialog = constrained_delegate->GetWebContents();
EnableInternalPDFPluginForContents(preview_dialog);
PrintViewManager::CreateForWebContents(preview_dialog);
- extensions::ExtensionWebContentsObserver::CreateForWebContents(
+ extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
preview_dialog);
waiting_for_new_preview_page_ = true;