| Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
|
| index 67a4107b5f6308c90ec3db5c7bc099566301fb3d..d1da775ced3254bcef9fdb47b906d2077a8c7840 100644
|
| --- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.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.
|
|
|
| @@ -18,6 +18,7 @@
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/web_applications/web_app.h"
|
| +#include "chrome/common/extensions/api/icons/icons_handler.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "grit/ui_resources.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| @@ -285,7 +286,7 @@ void BrowserLauncherItemController::UpdateLauncher(content::WebContents* tab) {
|
| if (!new_image.isNull())
|
| item.image = new_image;
|
| else if (item.image.isNull())
|
| - item.image = extensions::Extension::GetDefaultIcon(true);
|
| + item.image = extensions::IconsInfo::GetDefaultAppIcon();
|
| } else {
|
| DCHECK_EQ(TYPE_TABBED, type());
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
|
|