OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/apps/install_chrome_app.h" | 5 #include "chrome/browser/apps/install_chrome_app.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/extensions/webstore_install_with_prompt.h" | 11 #include "chrome/browser/extensions/webstore_install_with_prompt.h" |
12 #include "chrome/browser/extensions/webstore_standalone_installer.h" | 12 #include "chrome/browser/extensions/webstore_standalone_installer.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_list.h" | 15 #include "chrome/browser/ui/browser_list.h" |
16 #include "chrome/browser/ui/browser_window.h" | 16 #include "chrome/browser/ui/browser_window.h" |
17 #include "chrome/common/extensions/webstore_install_result.h" | 17 #include "chrome/common/extensions/webstore_install_result.h" |
| 18 #include "components/crx_file/id_util.h" |
18 #include "extensions/browser/extension_registry.h" | 19 #include "extensions/browser/extension_registry.h" |
19 #include "extensions/common/extension.h" | |
20 #include "extensions/common/manifest_constants.h" | 20 #include "extensions/common/manifest_constants.h" |
21 | 21 |
22 using extensions::ExtensionRegistry; | 22 using extensions::ExtensionRegistry; |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 // The URL to the webstore page for a specific app. | 26 // The URL to the webstore page for a specific app. |
27 const char kWebstoreUrlFormat[] = | 27 const char kWebstoreUrlFormat[] = |
28 "https://chrome.google.com/webstore/detail/%s"; | 28 "https://chrome.google.com/webstore/detail/%s"; |
29 | 29 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 } | 67 } |
68 | 68 |
69 ProceedWithInstallPrompt(); | 69 ProceedWithInstallPrompt(); |
70 } | 70 } |
71 | 71 |
72 } // namespace | 72 } // namespace |
73 | 73 |
74 namespace install_chrome_app { | 74 namespace install_chrome_app { |
75 | 75 |
76 void InstallChromeApp(const std::string& app_id) { | 76 void InstallChromeApp(const std::string& app_id) { |
77 if (!extensions::Extension::IdIsValid(app_id)) | 77 if (!crx_file::id_util::IdIsValid(app_id)) |
78 return; | 78 return; |
79 | 79 |
80 // At the moment InstallChromeApp() is called immediately after handling | 80 // At the moment InstallChromeApp() is called immediately after handling |
81 // startup URLs, so a browser is guaranteed to be created. If that changes we | 81 // startup URLs, so a browser is guaranteed to be created. If that changes we |
82 // may need to start a browser or browser session here. | 82 // may need to start a browser or browser session here. |
83 Browser* browser = | 83 Browser* browser = |
84 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->get(0); | 84 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->get(0); |
85 DCHECK(browser); | 85 DCHECK(browser); |
86 | 86 |
87 content::OpenURLParams params(GetAppInstallUrl(app_id), | 87 content::OpenURLParams params(GetAppInstallUrl(app_id), |
(...skipping 14 matching lines...) Expand all Loading... |
102 if (installed_extension) | 102 if (installed_extension) |
103 return; | 103 return; |
104 | 104 |
105 WebstoreInstallWithPromptAppsOnly* installer = | 105 WebstoreInstallWithPromptAppsOnly* installer = |
106 new WebstoreInstallWithPromptAppsOnly( | 106 new WebstoreInstallWithPromptAppsOnly( |
107 app_id, browser->profile(), browser->window()->GetNativeWindow()); | 107 app_id, browser->profile(), browser->window()->GetNativeWindow()); |
108 installer->BeginInstall(); | 108 installer->BeginInstall(); |
109 } | 109 } |
110 | 110 |
111 } // namespace install_chrome_app | 111 } // namespace install_chrome_app |
OLD | NEW |