Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Side by Side Diff: chrome/browser/ui/app_list/extension_uninstaller.cc

Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address issue exposed by failing unit test. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/app_list/extension_uninstaller.h" 5 #include "chrome/browser/ui/app_list/extension_uninstaller.h"
6 6
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" 9 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
10 #include "extensions/browser/extension_system.h" 10 #include "extensions/browser/extension_system.h"
(...skipping 24 matching lines...) Expand all
35 extensions::ExtensionUninstallDialog::Create(profile_, NULL, this)); 35 extensions::ExtensionUninstallDialog::Create(profile_, NULL, this));
36 dialog_->ConfirmUninstall(extension); 36 dialog_->ConfirmUninstall(extension);
37 } 37 }
38 38
39 void ExtensionUninstaller::ExtensionUninstallAccepted() { 39 void ExtensionUninstaller::ExtensionUninstallAccepted() {
40 ExtensionService* service = 40 ExtensionService* service =
41 extensions::ExtensionSystem::Get(profile_)->extension_service(); 41 extensions::ExtensionSystem::Get(profile_)->extension_service();
42 const extensions::Extension* extension = 42 const extensions::Extension* extension =
43 service->GetInstalledExtension(app_id_); 43 service->GetInstalledExtension(app_id_);
44 if (extension) { 44 if (extension) {
45 service->UninstallExtension(app_id_, 45 service->UninstallExtension(
46 false, /* external_uninstall*/ 46 app_id_, ExtensionService::UNINSTALL_REASON_USER_INITIATED, NULL);
47 NULL);
48 } 47 }
49 controller_->OnCloseChildDialog(); 48 controller_->OnCloseChildDialog();
50 CleanUp(); 49 CleanUp();
51 } 50 }
52 51
53 void ExtensionUninstaller::ExtensionUninstallCanceled() { 52 void ExtensionUninstaller::ExtensionUninstallCanceled() {
54 controller_->OnCloseChildDialog(); 53 controller_->OnCloseChildDialog();
55 CleanUp(); 54 CleanUp();
56 } 55 }
57 56
58 void ExtensionUninstaller::CleanUp() { 57 void ExtensionUninstaller::CleanUp() {
59 delete this; 58 delete this;
60 } 59 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698