Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: extensions/browser/app_window/app_web_contents_helper.cc

Issue 486153002: Move AppWindow related classes to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/app_window/app_web_contents_helper.cc
diff --git a/apps/app_web_contents_helper.cc b/extensions/browser/app_window/app_web_contents_helper.cc
similarity index 89%
rename from apps/app_web_contents_helper.cc
rename to extensions/browser/app_window/app_web_contents_helper.cc
index 7c7b29336bf5e3faf06fc2c880c076866d5c546a..54153ac926c5286144b97ecdb1046f3b67bf64ca 100644
--- a/apps/app_web_contents_helper.cc
+++ b/extensions/browser/app_window/app_web_contents_helper.cc
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "apps/app_web_contents_helper.h"
+#include "extensions/browser/app_window/app_web_contents_helper.h"
-#include "apps/app_delegate.h"
#include "base/strings/stringprintf.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/page_navigator.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/browser/app_window/app_delegate.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/suggest_permission_util.h"
#include "extensions/common/extension_messages.h"
#include "extensions/common/permissions/api_permission.h"
-namespace apps {
+namespace extensions {
AppWebContentsHelper::AppWebContentsHelper(
content::BrowserContext* browser_context,
@@ -74,12 +74,12 @@ content::WebContents* AppWebContentsHelper::OpenURLFromTab(
}
void AppWebContentsHelper::RequestToLockMouse() const {
- const extensions::Extension* extension = GetExtension();
+ const Extension* extension = GetExtension();
if (!extension)
return;
bool has_permission = IsExtensionWithPermissionOrSuggestInConsole(
- extensions::APIPermission::kPointerLock,
+ APIPermission::kPointerLock,
extension,
web_contents_->GetRenderViewHost());
@@ -89,7 +89,7 @@ void AppWebContentsHelper::RequestToLockMouse() const {
void AppWebContentsHelper::RequestMediaAccessPermission(
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) const {
- const extensions::Extension* extension = GetExtension();
+ const Extension* extension = GetExtension();
if (!extension)
return;
@@ -97,8 +97,8 @@ void AppWebContentsHelper::RequestMediaAccessPermission(
web_contents_, request, callback, extension);
}
-const extensions::Extension* AppWebContentsHelper::GetExtension() const {
- return extensions::ExtensionRegistry::Get(browser_context_)
+const Extension* AppWebContentsHelper::GetExtension() const {
+ return ExtensionRegistry::Get(browser_context_)
->enabled_extensions()
.GetByID(extension_id_);
}
@@ -111,4 +111,4 @@ void AppWebContentsHelper::AddMessageToDevToolsConsole(
rvh->GetRoutingID(), level, message));
}
-} // namespace apps
+} // namespace extensions
« no previous file with comments | « extensions/browser/app_window/app_web_contents_helper.h ('k') | extensions/browser/app_window/app_window_geometry_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698