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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.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 (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/ui/webui/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/app_window.h" 8 #include "apps/app_window.h"
9 #include "apps/app_window_registry.h" 9 #include "apps/app_window_registry.h"
10 #include "apps/saved_files_service.h" 10 #include "apps/saved_files_service.h"
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->GetExtensionById( 753 ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->GetExtensionById(
754 extension_id_prompting_, ExtensionRegistry::TERMINATED); 754 extension_id_prompting_, ExtensionRegistry::TERMINATED);
755 was_terminated = true; 755 was_terminated = true;
756 } 756 }
757 if (!extension) 757 if (!extension)
758 return; 758 return;
759 759
760 extension_service_->UninstallExtension( 760 extension_service_->UninstallExtension(
761 extension_id_prompting_, 761 extension_id_prompting_,
762 extensions::UNINSTALL_REASON_USER_INITIATED, 762 extensions::UNINSTALL_REASON_USER_INITIATED,
763 base::Bind(&base::DoNothing),
763 NULL); // Error. 764 NULL); // Error.
764 extension_id_prompting_ = ""; 765 extension_id_prompting_ = "";
765 766
766 // There will be no EXTENSION_UNLOADED notification for terminated 767 // There will be no EXTENSION_UNLOADED notification for terminated
767 // extensions as they were already unloaded. 768 // extensions as they were already unloaded.
768 if (was_terminated) 769 if (was_terminated)
769 HandleRequestExtensionsData(NULL); 770 HandleRequestExtensionsData(NULL);
770 } 771 }
771 772
772 void ExtensionSettingsHandler::ExtensionUninstallCanceled() { 773 void ExtensionSettingsHandler::ExtensionUninstallCanceled() {
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 extension_service_->EnableExtension(extension_id); 1393 extension_service_->EnableExtension(extension_id);
1393 } else { 1394 } else {
1394 ExtensionErrorReporter::GetInstance()->ReportError( 1395 ExtensionErrorReporter::GetInstance()->ReportError(
1395 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1396 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1396 true); // Be noisy. 1397 true); // Be noisy.
1397 } 1398 }
1398 requirements_checker_.reset(); 1399 requirements_checker_.reset();
1399 } 1400 }
1400 1401
1401 } // namespace extensions 1402 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698