| OLD | NEW |
| 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/views/aura/launcher/launcher_icon_loader.h" | 5 #include "chrome/browser/ui/views/ash/launcher/launcher_icon_loader.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 9 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 10 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
| 11 #include "chrome/common/extensions/extension_resource.h" | 11 #include "chrome/common/extensions/extension_resource.h" |
| 12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
| 13 | 13 |
| 14 LauncherIconLoader::LauncherIconLoader(Profile* profile, | 14 LauncherIconLoader::LauncherIconLoader(Profile* profile, |
| 15 ChromeLauncherDelegate* delegate) | 15 ChromeLauncherDelegate* delegate) |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 return NULL; | 70 return NULL; |
| 71 return extension_service->GetInstalledApp(tab->web_contents()->GetURL()); | 71 return extension_service->GetInstalledApp(tab->web_contents()->GetURL()); |
| 72 } | 72 } |
| 73 | 73 |
| 74 const Extension* LauncherIconLoader::GetExtensionByID(const std::string& id) { | 74 const Extension* LauncherIconLoader::GetExtensionByID(const std::string& id) { |
| 75 ExtensionService* service = profile_->GetExtensionService(); | 75 ExtensionService* service = profile_->GetExtensionService(); |
| 76 if (!service) | 76 if (!service) |
| 77 return NULL; | 77 return NULL; |
| 78 return service->GetInstalledExtension(id); | 78 return service->GetInstalledExtension(id); |
| 79 } | 79 } |
| OLD | NEW |