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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/extensions/file_browser_private_api.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: Created 7 years, 10 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/background/background_contents_service.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/file_browser_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 1b68d4c2ce2374d6f9ef826aa0ecbfe53a4ee98c..79581f04f7b599f4d1f524a3c994f0b0bdad5bdc 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -55,6 +55,7 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/views/select_file_dialog_extension.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
@@ -948,8 +949,8 @@ bool GetFileTasksFileBrowserFunction::FindAppTasks(
task->SetString("title", (*i)->title);
task->SetBoolean("isDefault", false);
- GURL best_icon = extension->GetIconURL(kPreferredIconSize,
- ExtensionIconSet::MATCH_BIGGER);
+ GURL best_icon = extensions::IconsInfo::GetIconURL(
+ extension, kPreferredIconSize, ExtensionIconSet::MATCH_BIGGER);
if (!best_icon.is_empty())
task->SetString("iconUrl", best_icon.spec());
else
« no previous file with comments | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698