diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 09:39:55 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 09:41:15 +0000 |
| commit | 21d3f3af7ad25ea37d10901e915e8af0f2f3d72d (patch) | |
| tree | cdb9c4999546d0df1585e4509c3d79e42f0c41ed /apps/custom_launcher_page_contents.cc | |
| parent | b6f801cc56e0baa1436816b549617e9b3a9eeb71 (diff) | |
| download | chromium_src-21d3f3af7ad25ea37d10901e915e8af0f2f3d72d.zip chromium_src-21d3f3af7ad25ea37d10901e915e8af0f2f3d72d.tar.gz chromium_src-21d3f3af7ad25ea37d10901e915e8af0f2f3d72d.tar.bz2 | |
Move AppWindow related classes to extensions
Move AppDelegate, AppWebContentsHelper and AppWindowGeometryCache to extensions/browser/app_window
Change the namespace from apps to extensions.
BUG=403726
R=benwells@chromium.org
Review URL: https://codereview.chromium.org/486153002
Cr-Commit-Position: refs/heads/master@{#290796}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/custom_launcher_page_contents.cc')
| -rw-r--r-- | apps/custom_launcher_page_contents.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/custom_launcher_page_contents.cc b/apps/custom_launcher_page_contents.cc index 1c5eeae..023c305 100644 --- a/apps/custom_launcher_page_contents.cc +++ b/apps/custom_launcher_page_contents.cc @@ -6,21 +6,21 @@ #include <string> -#include "apps/app_delegate.h" -#include "apps/app_web_contents_helper.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/common/renderer_preferences.h" +#include "extensions/browser/app_window/app_delegate.h" +#include "extensions/browser/app_window/app_web_contents_helper.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension_messages.h" namespace apps { CustomLauncherPageContents::CustomLauncherPageContents( - scoped_ptr<AppDelegate> app_delegate, + scoped_ptr<extensions::AppDelegate> app_delegate, const std::string& extension_id) : app_delegate_(app_delegate.Pass()), extension_id_(extension_id) { } @@ -42,7 +42,7 @@ void CustomLauncherPageContents::Initialize(content::BrowserContext* context, ->browser_handles_all_top_level_requests = true; web_contents_->GetRenderViewHost()->SyncRendererPrefs(); - helper_.reset(new AppWebContentsHelper( + helper_.reset(new extensions::AppWebContentsHelper( context, extension_id_, web_contents_.get(), app_delegate_.get())); web_contents_->SetDelegate(this); @@ -94,7 +94,7 @@ bool CustomLauncherPageContents::ShouldSuppressDialogs() { bool CustomLauncherPageContents::PreHandleGestureEvent( content::WebContents* source, const blink::WebGestureEvent& event) { - return AppWebContentsHelper::ShouldSuppressGestureEvent(event); + return extensions::AppWebContentsHelper::ShouldSuppressGestureEvent(event); } content::ColorChooser* CustomLauncherPageContents::OpenColorChooser( |