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

Unified Diff: chrome/browser/extensions/api/messaging/message_service.cc

Issue 22794012: Rename extension_manifest_keys namespace to extensions::manifest_keys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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/extensions/api/messaging/message_service.cc
diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc
index 00e40f7eb03c132604c0b46838e07430c6b5d75d..be6d2feeeec6a79f841f456fded498d0e85d680f 100644
--- a/chrome/browser/extensions/api/messaging/message_service.cc
+++ b/chrome/browser/extensions/api/messaging/message_service.cc
@@ -26,7 +26,6 @@
#include "chrome/browser/tab_contents/tab_util.h"
#include "chrome/common/extensions/background_info.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/incognito_handler.h"
#include "chrome/common/extensions/manifest_handlers/externally_connectable.h"
@@ -38,6 +37,7 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/common/manifest_constants.h"
#include "url/gurl.h"
using content::SiteInstance;
@@ -113,7 +113,7 @@ static base::StaticAtomicSequenceNumber g_channel_id_overflow_count;
static content::RenderProcessHost* GetExtensionProcess(
Profile* profile, const std::string& extension_id) {
SiteInstance* site_instance =
- extensions::ExtensionSystem::Get(profile)->process_manager()->
+ ExtensionSystem::Get(profile)->process_manager()->
GetSiteInstanceForURL(
Extension::GetBaseURLFromExtensionId(extension_id));
@@ -206,7 +206,7 @@ void MessageService::OpenChannelToExtension(
}
ExtensionService* extension_service =
- extensions::ExtensionSystem::Get(profile)->extension_service();
+ ExtensionSystem::Get(profile)->extension_service();
if (profile->IsOffTheRecord() &&
!extension_service->IsIncognitoEnabled(target_extension_id)) {
@@ -222,7 +222,7 @@ void MessageService::OpenChannelToExtension(
ExternallyConnectableInfo* externally_connectable =
static_cast<ExternallyConnectableInfo*>(
target_extension->GetManifestData(
- extension_manifest_keys::kExternallyConnectable));
+ manifest_keys::kExternallyConnectable));
bool is_externally_connectable = false;
if (externally_connectable) {
@@ -305,7 +305,7 @@ void MessageService::OpenChannelToNativeApp(
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
Profile* profile = Profile::FromBrowserContext(source->GetBrowserContext());
ExtensionService* extension_service =
- extensions::ExtensionSystem::Get(profile)->extension_service();
+ ExtensionSystem::Get(profile)->extension_service();
bool has_permission = false;
if (extension_service) {
const Extension* extension =

Powered by Google App Engine
This is Rietveld 408576698