diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 20:27:42 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 20:27:42 +0000 |
| commit | 885c0e94fd5e3d81bb258191d720b7b22ca683df (patch) | |
| tree | 27022b02d52dda9e1cb8b86cde08c86220615f56 /chrome/browser/nacl_host/nacl_process_host.cc | |
| parent | bf4d4efcd977d9f4438725d77e6bc9e02aac4b1c (diff) | |
| download | chromium_src-885c0e94fd5e3d81bb258191d720b7b22ca683df.zip chromium_src-885c0e94fd5e3d81bb258191d720b7b22ca683df.tar.gz chromium_src-885c0e94fd5e3d81bb258191d720b7b22ca683df.tar.bz2 | |
Establish /extensions directory and move URLPattern there.
This doesn't create an extensions gyp target, or a module with a public API.
It does set of DEPS rules and seems like it will make it easier for people to
write correctly layered code today, while we are in transition.
BUG=159265
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/11410015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host/nacl_process_host.cc')
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 154ac46..c854c1a 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -28,7 +28,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/url_pattern.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/nacl_cmd_line.h" #include "chrome/common/nacl_messages.h" @@ -38,6 +37,8 @@ #include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/child_process_data.h" #include "content/public/common/child_process_host.h" +#include "extensions/common/constants.h" +#include "extensions/common/url_pattern.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_switches.h" #include "native_client/src/shared/imc/nacl_imc.h" @@ -52,8 +53,8 @@ #elif defined(OS_WIN) #include <windows.h> -#include "base/threading/thread.h" #include "base/process_util.h" +#include "base/threading/thread.h" #include "base/win/scoped_handle.h" #include "chrome/browser/nacl_host/nacl_broker_service_win.h" #include "chrome/common/nacl_debug_exception_handler_win.h" @@ -469,7 +470,8 @@ void NaClProcessHost::OnNaClGdbAttached() { FilePath NaClProcessHost::GetManifestPath() { const extensions::Extension* extension = extension_info_map_->extensions() .GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url_)); - if (extension != NULL && manifest_url_.SchemeIs(chrome::kExtensionScheme)) { + if (extension != NULL && + manifest_url_.SchemeIs(extensions::kExtensionScheme)) { std::string path = manifest_url_.path(); TrimString(path, "/", &path); // Remove first slash return extension->path().AppendASCII(path); |