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

Side by Side Diff: chrome/browser/extensions/external_install_error.cc

Issue 421193002: Fix ExtensionServiceTest.ClearExtensionData flakiness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use base::DoNothing for empty callbacks Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 manager_->RemoveExternalInstallError(); 280 manager_->RemoveExternalInstallError();
281 } 281 }
282 } 282 }
283 283
284 void ExternalInstallError::InstallUIAbort(bool user_initiated) { 284 void ExternalInstallError::InstallUIAbort(bool user_initiated) {
285 if (user_initiated && GetExtension()) { 285 if (user_initiated && GetExtension()) {
286 ExtensionSystem::Get(browser_context_) 286 ExtensionSystem::Get(browser_context_)
287 ->extension_service() 287 ->extension_service()
288 ->UninstallExtension(extension_id_, 288 ->UninstallExtension(extension_id_,
289 extensions::UNINSTALL_REASON_INSTALL_CANCELED, 289 extensions::UNINSTALL_REASON_INSTALL_CANCELED,
290 base::Bind(&base::DoNothing),
290 NULL); // Ignore error. 291 NULL); // Ignore error.
291 // Since the manager listens for the extension to be removed, this will 292 // Since the manager listens for the extension to be removed, this will
292 // remove the error... 293 // remove the error...
293 } else { 294 } else {
294 // ... Otherwise we have to do it explicitly. 295 // ... Otherwise we have to do it explicitly.
295 manager_->RemoveExternalInstallError(); 296 manager_->RemoveExternalInstallError();
296 } 297 }
297 } 298 }
298 299
299 void ExternalInstallError::ShowDialog(Browser* browser) { 300 void ExternalInstallError::ShowDialog(Browser* browser) {
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 if (browser) 384 if (browser)
384 global_error_->ShowBubbleView(browser); 385 global_error_->ShowBubbleView(browser);
385 } else { 386 } else {
386 DCHECK(alert_type_ == MENU_ALERT); 387 DCHECK(alert_type_ == MENU_ALERT);
387 global_error_.reset(new ExternalInstallMenuAlert(this)); 388 global_error_.reset(new ExternalInstallMenuAlert(this));
388 error_service_->AddGlobalError(global_error_.get()); 389 error_service_->AddGlobalError(global_error_.get());
389 } 390 }
390 } 391 }
391 392
392 } // namespace extensions 393 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_storage_monitor.cc ('k') | chrome/browser/extensions/shared_module_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698