OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/bundle_installer.h" | 5 #include "chrome/browser/extensions/bundle_installer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 } | 149 } |
150 | 150 |
151 // Start each WebstoreInstaller. | 151 // Start each WebstoreInstaller. |
152 for (ItemMap::iterator i = items_.begin(); i != items_.end(); ++i) { | 152 for (ItemMap::iterator i = items_.begin(); i != items_.end(); ++i) { |
153 if (i->second.state != Item::STATE_PENDING) | 153 if (i->second.state != Item::STATE_PENDING) |
154 continue; | 154 continue; |
155 | 155 |
156 // Since we've already confirmed the permissions, create an approval that | 156 // Since we've already confirmed the permissions, create an approval that |
157 // lets CrxInstaller bypass the prompt. | 157 // lets CrxInstaller bypass the prompt. |
158 scoped_ptr<WebstoreInstaller::Approval> approval( | 158 scoped_ptr<WebstoreInstaller::Approval> approval( |
159 WebstoreInstaller::Approval::CreateWithNoInstallPrompt( | 159 new WebstoreInstaller::Approval); |
160 profile_, | 160 approval->extension_id = i->first; |
161 i->first, | 161 approval->profile = profile_; |
162 scoped_ptr<base::DictionaryValue>( | 162 approval->parsed_manifest.reset(parsed_manifests_[i->first]->DeepCopy()); |
163 parsed_manifests_[i->first]->DeepCopy()))); | |
164 approval->use_app_installed_bubble = false; | 163 approval->use_app_installed_bubble = false; |
165 approval->skip_post_install_ui = true; | 164 approval->skip_post_install_ui = true; |
166 | 165 |
167 scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller( | 166 scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller( |
168 profile_, | 167 profile_, |
169 this, | 168 this, |
170 controller, | 169 controller, |
171 i->first, | 170 i->first, |
172 approval.Pass(), | 171 approval.Pass(), |
173 WebstoreInstaller::FLAG_NONE); | 172 WebstoreInstaller::FLAG_NONE); |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 void BundleInstaller::OnBrowserAdded(const Browser* browser) {} | 334 void BundleInstaller::OnBrowserAdded(const Browser* browser) {} |
336 | 335 |
337 void BundleInstaller::OnBrowserRemoved(const Browser* browser) { | 336 void BundleInstaller::OnBrowserRemoved(const Browser* browser) { |
338 if (browser_ == browser) | 337 if (browser_ == browser) |
339 browser_ = NULL; | 338 browser_ = NULL; |
340 } | 339 } |
341 | 340 |
342 void BundleInstaller::OnBrowserSetLastActive(const Browser* browser) {} | 341 void BundleInstaller::OnBrowserSetLastActive(const Browser* browser) {} |
343 | 342 |
344 } // namespace extensions | 343 } // namespace extensions |
OLD | NEW |