Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / apps / install_chrome_app.cc

diff --git a/src/chrome/browser/apps/install_chrome_app.cc b/src/chrome/browser/apps/install_chrome_app.cc
index e433991..6ff3aa6 100644 (file)
--- a/src/chrome/browser/apps/install_chrome_app.cc
+++ b/src/chrome/browser/apps/install_chrome_app.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/extensions/webstore_install_result.h"
+#include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 
 using extensions::ExtensionRegistry;
@@ -74,7 +74,7 @@ void WebstoreInstallWithPromptAppsOnly::OnManifestParsed() {
 namespace install_chrome_app {
 
 void InstallChromeApp(const std::string& app_id) {
-  if (!extensions::Extension::IdIsValid(app_id))
+  if (!crx_file::id_util::IdIsValid(app_id))
     return;
 
   // At the moment InstallChromeApp() is called immediately after handling
@@ -87,7 +87,7 @@ void InstallChromeApp(const std::string& app_id) {
   content::OpenURLParams params(GetAppInstallUrl(app_id),
                                 content::Referrer(),
                                 NEW_FOREGROUND_TAB,
-                                content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+                                ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                 false);
   browser->OpenURL(params);