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

Unified Diff: chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.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
Index: chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
index 9d0ac0856572c000f18246778396c1924f5b100b..12f88390bd900e7cb14aed6c0972c6a268a43c33 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
@@ -22,7 +22,7 @@ LauncherAppIconLoader::~LauncherAppIconLoader() {
}
std::string LauncherAppIconLoader::GetAppID(TabContentsWrapper* tab) {
- const Extension* extension = GetExtensionForTab(tab);
+ const extensions::Extension* extension = GetExtensionForTab(tab);
return extension ? extension->id() : std::string();
}
@@ -37,7 +37,7 @@ void LauncherAppIconLoader::FetchImage(const std::string& id) {
return; // Already loading the image.
}
- const Extension* extension = GetExtensionByID(id);
+ const extensions::Extension* extension = GetExtensionByID(id);
if (!extension)
return;
if (!image_loader_.get())
@@ -67,7 +67,7 @@ void LauncherAppIconLoader::OnImageLoaded(const gfx::Image& image,
host_->SetAppImage(id, image.ToSkBitmap());
}
-const Extension* LauncherAppIconLoader::GetExtensionForTab(
+const extensions::Extension* LauncherAppIconLoader::GetExtensionForTab(
TabContentsWrapper* tab) {
ExtensionService* extension_service = profile_->GetExtensionService();
if (!extension_service)
@@ -75,7 +75,7 @@ const Extension* LauncherAppIconLoader::GetExtensionForTab(
return extension_service->GetInstalledApp(tab->web_contents()->GetURL());
}
-const Extension* LauncherAppIconLoader::GetExtensionByID(
+const extensions::Extension* LauncherAppIconLoader::GetExtensionByID(
const std::string& id) {
ExtensionService* service = profile_->GetExtensionService();
if (!service)
« no previous file with comments | « chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h ('k') | chrome/browser/ui/views/browser_actions_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698