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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/infobars/extension_infobar.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« chrome/browser/sync/test/integration/sync_extension_helper.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/location_bar/page_action_image_view.cc » ('j') | chrome/chrome_browser_extensions.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/infobars/extension_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index bf191986957163bc7a244d1d99ad40de71fe01cb..0a32194b80b4b8072daacfac4d1ebce759a5859e 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -14,7 +14,7 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
-#include "chrome/common/extensions/extension_resource.h"
+#include "extensions/common/extension_resource.h"
#include "grit/theme_resources.h"
#include "ui/base/animation/slide_animation.h"
#include "ui/base/resource/resource_bundle.h"
@@ -146,8 +146,9 @@ void ExtensionInfoBar::ViewHierarchyChanged(bool is_add,
const extensions::Extension* extension = extension_host->extension();
extension_misc::ExtensionIcons image_size =
extension_misc::EXTENSION_ICON_BITTY;
- ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
- extension, image_size, ExtensionIconSet::MATCH_EXACTLY);
+ extensions::ExtensionResource icon_resource =
+ extensions::IconsInfo::GetIconResource(
+ extension, image_size, ExtensionIconSet::MATCH_EXACTLY);
extensions::ImageLoader* loader =
extensions::ImageLoader::Get(extension_host->profile());
loader->LoadImageAsync(
« chrome/browser/sync/test/integration/sync_extension_helper.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/location_bar/page_action_image_view.cc » ('j') | chrome/chrome_browser_extensions.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698