| 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/extensions/external_install_error.h" | 5 #include "chrome/browser/extensions/external_install_error.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 } else { | 277 } else { |
| 278 // ... Otherwise we have to do it explicitly. | 278 // ... Otherwise we have to do it explicitly. |
| 279 manager_->RemoveExternalInstallError(); | 279 manager_->RemoveExternalInstallError(); |
| 280 } | 280 } |
| 281 } | 281 } |
| 282 | 282 |
| 283 void ExternalInstallError::InstallUIAbort(bool user_initiated) { | 283 void ExternalInstallError::InstallUIAbort(bool user_initiated) { |
| 284 if (user_initiated && GetExtension()) { | 284 if (user_initiated && GetExtension()) { |
| 285 ExtensionSystem::Get(browser_context_) | 285 ExtensionSystem::Get(browser_context_) |
| 286 ->extension_service() | 286 ->extension_service() |
| 287 ->UninstallExtension( | 287 ->UninstallExtension(extension_id_, |
| 288 extension_id_, | 288 false, // Not externally uninstalled. |
| 289 ExtensionService::UNINSTALL_REASON_EXTERNAL_INSTALL_CANCELED, | 289 NULL); // Ignore error. |
| 290 NULL); // Ignore error. | |
| 291 // Since the manager listens for the extension to be removed, this will | 290 // Since the manager listens for the extension to be removed, this will |
| 292 // remove the error... | 291 // remove the error... |
| 293 } else { | 292 } else { |
| 294 // ... Otherwise we have to do it explicitly. | 293 // ... Otherwise we have to do it explicitly. |
| 295 manager_->RemoveExternalInstallError(); | 294 manager_->RemoveExternalInstallError(); |
| 296 } | 295 } |
| 297 } | 296 } |
| 298 | 297 |
| 299 void ExternalInstallError::ShowDialog(Browser* browser) { | 298 void ExternalInstallError::ShowDialog(Browser* browser) { |
| 300 DCHECK(install_ui_.get()); | 299 DCHECK(install_ui_.get()); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 if (browser) | 382 if (browser) |
| 384 global_error_->ShowBubbleView(browser); | 383 global_error_->ShowBubbleView(browser); |
| 385 } else { | 384 } else { |
| 386 DCHECK(alert_type_ == MENU_ALERT); | 385 DCHECK(alert_type_ == MENU_ALERT); |
| 387 global_error_.reset(new ExternalInstallMenuAlert(this)); | 386 global_error_.reset(new ExternalInstallMenuAlert(this)); |
| 388 error_service_->AddGlobalError(global_error_.get()); | 387 error_service_->AddGlobalError(global_error_.get()); |
| 389 } | 388 } |
| 390 } | 389 } |
| 391 | 390 |
| 392 } // namespace extensions | 391 } // namespace extensions |
| OLD | NEW |