| 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 // Abort if we couldn't create any Extensions out of the manifests. | 251 // Abort if we couldn't create any Extensions out of the manifests. |
| 252 if (dummy_extensions_.empty()) { | 252 if (dummy_extensions_.empty()) { |
| 253 ReportCanceled(false); | 253 ReportCanceled(false); |
| 254 return; | 254 return; |
| 255 } | 255 } |
| 256 | 256 |
| 257 scoped_refptr<PermissionSet> permissions; | 257 scoped_refptr<PermissionSet> permissions; |
| 258 for (size_t i = 0; i < dummy_extensions_.size(); ++i) { | 258 for (size_t i = 0; i < dummy_extensions_.size(); ++i) { |
| 259 permissions = PermissionSet::CreateUnion( | 259 permissions = PermissionSet::CreateUnion( |
| 260 permissions.get(), | 260 permissions.get(), |
| 261 PermissionsData::ForExtension(dummy_extensions_[i]) | 261 dummy_extensions_[i]->permissions_data()->active_permissions()); |
| 262 ->active_permissions()); | |
| 263 } | 262 } |
| 264 | 263 |
| 265 if (g_auto_approve_for_test == PROCEED) { | 264 if (g_auto_approve_for_test == PROCEED) { |
| 266 InstallUIProceed(); | 265 InstallUIProceed(); |
| 267 } else if (g_auto_approve_for_test == ABORT) { | 266 } else if (g_auto_approve_for_test == ABORT) { |
| 268 InstallUIAbort(true); | 267 InstallUIAbort(true); |
| 269 } else { | 268 } else { |
| 270 Browser* browser = browser_; | 269 Browser* browser = browser_; |
| 271 if (!browser) { | 270 if (!browser) { |
| 272 // The browser that we got initially could have gone away during our | 271 // The browser that we got initially could have gone away during our |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 void BundleInstaller::OnBrowserAdded(Browser* browser) {} | 345 void BundleInstaller::OnBrowserAdded(Browser* browser) {} |
| 347 | 346 |
| 348 void BundleInstaller::OnBrowserRemoved(Browser* browser) { | 347 void BundleInstaller::OnBrowserRemoved(Browser* browser) { |
| 349 if (browser_ == browser) | 348 if (browser_ == browser) |
| 350 browser_ = NULL; | 349 browser_ = NULL; |
| 351 } | 350 } |
| 352 | 351 |
| 353 void BundleInstaller::OnBrowserSetLastActive(Browser* browser) {} | 352 void BundleInstaller::OnBrowserSetLastActive(Browser* browser) {} |
| 354 | 353 |
| 355 } // namespace extensions | 354 } // namespace extensions |
| OLD | NEW |