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

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: Latest master + Yoyo's requests Created 7 years, 11 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/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 5bb25067a5603e9fa4157acd2468b7cb6832b24d..5addc0c989964f4cb49c75beb21039f039329e06 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -57,6 +57,7 @@
#include "chrome/browser/ui/views/select_file_dialog_extension.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/browser/ui/webui/web_ui_util.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"
@@ -939,8 +940,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
@@ -992,8 +993,8 @@ bool GetFileTasksFileBrowserFunction::FindWebIntentTasks(
task->SetString("title", 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

Powered by Google App Engine
This is Rietveld 408576698