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

Unified Diff: chrome/browser/guest_view/app_view/app_view_guest.cc

Issue 456983003: Remove unnecessary "extensions::" prefix in guest_view/web_view/app_view directories. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update web_view_guest 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: chrome/browser/guest_view/app_view/app_view_guest.cc
diff --git a/chrome/browser/guest_view/app_view/app_view_guest.cc b/chrome/browser/guest_view/app_view/app_view_guest.cc
index f92e4ab02b3d993e988007848268d6718f82bc31..04f12d9549f8fc2ea2ebb9a7ee3bc67a7f52cb96 100644
--- a/chrome/browser/guest_view/app_view/app_view_guest.cc
+++ b/chrome/browser/guest_view/app_view/app_view_guest.cc
@@ -35,11 +35,11 @@ namespace extensions {
namespace {
struct ResponseInfo {
- scoped_refptr<const extensions::Extension> guest_extension;
+ scoped_refptr<const Extension> guest_extension;
base::WeakPtr<AppViewGuest> app_view_guest;
GuestViewBase::WebContentsCreatedCallback callback;
- ResponseInfo(const extensions::Extension* guest_extension,
+ ResponseInfo(const Extension* guest_extension,
const base::WeakPtr<AppViewGuest>& app_view_guest,
const GuestViewBase::WebContentsCreatedCallback& callback)
: guest_extension(guest_extension),
@@ -108,7 +108,7 @@ AppViewGuest::AppViewGuest(content::BrowserContext* browser_context,
AppViewGuest::~AppViewGuest() {
}
-extensions::WindowController* AppViewGuest::GetExtensionWindowController()
+WindowController* AppViewGuest::GetExtensionWindowController()
const {
Fady Samuel 2014/08/12 21:25:30 can this now go on the line above?
Xi Han 2014/08/12 21:53:48 Done.
return NULL;
}
@@ -153,10 +153,10 @@ void AppViewGuest::CreateWebContents(
}
ExtensionService* service =
- extensions::ExtensionSystem::Get(browser_context())->extension_service();
- const extensions::Extension* guest_extension =
+ ExtensionSystem::Get(browser_context())->extension_service();
Fady Samuel 2014/08/12 21:25:29 Can this go on the previous line?
Xi Han 2014/08/12 21:53:48 Done.
+ const Extension* guest_extension =
service->GetExtensionById(app_id, false);
Fady Samuel 2014/08/12 21:25:29 Can this go on the previous line?
Xi Han 2014/08/12 21:53:48 Done.
- const extensions::Extension* embedder_extension =
+ const Extension* embedder_extension =
service->GetExtensionById(embedder_extension_id, false);
Fady Samuel 2014/08/12 21:25:29 can this go on the previous line?
Xi Han 2014/08/12 21:53:48 This line exceeds the limits.
if (!guest_extension || !guest_extension->is_platform_app() ||
@@ -172,8 +172,8 @@ void AppViewGuest::CreateWebContents(
weak_ptr_factory_.GetWeakPtr(),
callback))));
- extensions::LazyBackgroundTaskQueue* queue =
- extensions::ExtensionSystem::Get(browser_context())->
+ LazyBackgroundTaskQueue* queue =
+ ExtensionSystem::Get(browser_context())->
Fady Samuel 2014/08/12 21:25:29 Move to previous line?
Xi Han 2014/08/12 21:53:48 Done.
lazy_background_task_queue();
if (queue->ShouldEnqueueTask(browser_context(), guest_extension)) {
queue->AddPendingTask(browser_context(),
@@ -184,8 +184,8 @@ void AppViewGuest::CreateWebContents(
return;
}
- extensions::ProcessManager* process_manager =
- extensions::ExtensionSystem::Get(browser_context())->process_manager();
+ ProcessManager* process_manager =
+ ExtensionSystem::Get(browser_context())->process_manager();
ExtensionHost* host =
process_manager->GetBackgroundHostForExtension(guest_extension->id());
DCHECK(host);
@@ -203,7 +203,7 @@ void AppViewGuest::DidAttachToEmbedder() {
void AppViewGuest::DidInitialize() {
extension_function_dispatcher_.reset(
- new extensions::ExtensionFunctionDispatcher(browser_context(), this));
+ new ExtensionFunctionDispatcher(browser_context(), this));
}
void AppViewGuest::OnRequest(const ExtensionHostMsg_Request_Params& params) {
@@ -213,7 +213,7 @@ void AppViewGuest::OnRequest(const ExtensionHostMsg_Request_Params& params) {
void AppViewGuest::CompleteCreateWebContents(
const GURL& url,
- const extensions::Extension* guest_extension,
+ const Extension* guest_extension,
const WebContentsCreatedCallback& callback) {
if (!url.is_valid()) {
callback.Run(NULL);
@@ -233,8 +233,8 @@ void AppViewGuest::CompleteCreateWebContents(
void AppViewGuest::LaunchAppAndFireEvent(
const WebContentsCreatedCallback& callback,
ExtensionHost* extension_host) {
- extensions::ExtensionSystem* system =
- extensions::ExtensionSystem::Get(browser_context());
+ ExtensionSystem* system =
+ ExtensionSystem::Get(browser_context());
Fady Samuel 2014/08/12 21:25:30 Move to previous line?
Xi Han 2014/08/12 21:53:48 Done.
bool has_event_listener = system->event_router()->ExtensionHasEventListener(
extension_host->extension()->id(),
app_runtime::OnEmbedRequested::kEventName);
@@ -246,7 +246,7 @@ void AppViewGuest::LaunchAppAndFireEvent(
scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue());
embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID());
embed_request->SetString(appview::kEmbedderID, embedder_extension_id());
- extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent(
+ AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent(
browser_context(), embed_request.Pass(), extension_host->extension());
}

Powered by Google App Engine
This is Rietveld 408576698