summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_applications
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
commit1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch)
treebb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/web_applications
parente2a374f50043586ff684e0720bbbd99b9aa15c07 (diff)
downloadchromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2
Move Extension into extensions namespace
BUG=117262 TBR=aa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10375021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_applications')
-rw-r--r--chrome/browser/web_applications/web_app.cc2
-rw-r--r--chrome/browser/web_applications/web_app.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index cc58900..a502b5a 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -81,7 +81,7 @@ FilePath GetWebAppDataDirectory(const FilePath& profile_path,
}
FilePath GetWebAppDataDirectory(const FilePath& profile_path,
- const Extension& extension) {
+ const extensions::Extension& extension) {
return GetWebAppDataDirectory(
profile_path, extension.id(), GURL(extension.launch_web_url()));
}
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h
index a9e55a6..253c88f 100644
--- a/chrome/browser/web_applications/web_app.h
+++ b/chrome/browser/web_applications/web_app.h
@@ -14,7 +14,9 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/common/web_apps.h"
+namespace extensions {
class Extension;
+}
namespace web_app {
@@ -28,7 +30,7 @@ FilePath GetWebAppDataDirectory(const FilePath& profile_path,
// Gets the user data directory to use for |extension| located inside
// |profile_path|.
FilePath GetWebAppDataDirectory(const FilePath& profile_path,
- const Extension& extension);
+ const extensions::Extension& extension);
// Compute a deterministic name based on data in the shortcut_info.
std::string GenerateApplicationNameFromInfo(