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

Unified Diff: chrome/browser/search/hotword_service.cc

Issue 398083002: Add "UninstallReason" parameter to ExtensionRegistryObserver::OnExtensionUninstalled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix header file. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/search/hotword_service.h ('k') | chrome/browser/sync/test/integration/extensions_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/hotword_service.cc
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
index 607ec1d0100cb99563090446dd3a98507828440b..29b883d55d4293bc3fa789c8b26e57378b128f7d 100644
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -26,6 +26,7 @@
#include "content/public/browser/plugin_service.h"
#include "content/public/common/webplugininfo.h"
#include "extensions/browser/extension_system.h"
+#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension.h"
#include "extensions/common/one_shot_event.h"
#include "grit/generated_resources.h"
@@ -255,7 +256,8 @@ void HotwordService::Observe(int type,
void HotwordService::OnExtensionUninstalled(
content::BrowserContext* browser_context,
- const extensions::Extension* extension) {
+ const extensions::Extension* extension,
+ extensions::UninstallReason reason) {
CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
if (extension->id() != extension_misc::kHotwordExtensionId ||
@@ -362,7 +364,7 @@ bool HotwordService::UninstallHotwordExtension(
base::string16 error;
if (!extension_service->UninstallExtension(
extension_misc::kHotwordExtensionId,
- ExtensionService::UNINSTALL_REASON_INTERNAL_MANAGEMENT,
+ extensions::UNINSTALL_REASON_INTERNAL_MANAGEMENT,
&error)) {
LOG(WARNING) << "Cannot uninstall extension with id "
<< extension_misc::kHotwordExtensionId
« no previous file with comments | « chrome/browser/search/hotword_service.h ('k') | chrome/browser/sync/test/integration/extensions_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698