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

Unified Diff: chrome/browser/autocomplete/keyword_provider.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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/app_controller_mac.mm ('k') | chrome/browser/automation/automation_provider_json.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/keyword_provider.cc
diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc
index 1f701050f93c7a4d6f641835885615594843a819..ba2028b7306f42a636d70fb01a92cc273b00f56f 100644
--- a/chrome/browser/autocomplete/keyword_provider.cc
+++ b/chrome/browser/autocomplete/keyword_provider.cc
@@ -172,7 +172,7 @@ string16 KeywordProvider::GetKeywordForText(
// Don't provide a keyword for inactive/disabled extension keywords.
if (template_url->IsExtensionKeyword()) {
- const Extension* extension = profile_->GetExtensionService()->
+ const extensions::Extension* extension = profile_->GetExtensionService()->
GetExtensionById(template_url->GetExtensionId(), false);
if (!extension ||
(profile_->IsOffTheRecord() &&
@@ -249,7 +249,7 @@ void KeywordProvider::Start(const AutocompleteInput& input,
// we're incognito), or disabled.
if (profile_ && template_url->IsExtensionKeyword()) {
ExtensionService* service = profile_->GetExtensionService();
- const Extension* extension = service->GetExtensionById(
+ const extensions::Extension* extension = service->GetExtensionById(
template_url->GetExtensionId(), false);
bool enabled =
extension && (!profile_->IsOffTheRecord() ||
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/automation/automation_provider_json.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698