| 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 e75c81cbdd3e48a2116d5f1dbf29c7106f632356..5f8a3444a63e5d0ffd2e9012dbd4cbf3e162dac0 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.
|
|
|
| @@ -56,6 +56,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"
|
| @@ -930,8 +931,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
|
| @@ -983,8 +984,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
|
|
|