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

Unified Diff: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h

Issue 13139004: Deprecate Browser::TYPE_PANEL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h
index dec146462149f6b57a7bcb9af60eca296067a12a..e283fcea428fbbcfea79d7070978b07b1faa9a00 100644
--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h
@@ -19,7 +19,6 @@
#include "ui/aura/window_observer.h"
class Browser;
-class LauncherFaviconLoader;
namespace ash {
class LauncherModel;
@@ -29,7 +28,6 @@ class LauncherModel;
// representation of a window up to date as the active tab changes.
class BrowserLauncherItemController : public LauncherItemController,
public TabStripModelObserver,
- public LauncherFaviconLoader::Delegate,
public aura::WindowObserver {
public:
// This API is to be used as part of testing only.
@@ -64,10 +62,6 @@ class BrowserLauncherItemController : public LauncherItemController,
// specified browser.
static BrowserLauncherItemController* Create(Browser* browser);
- LauncherFaviconLoader* favicon_loader() const {
- return favicon_loader_.get();
- }
-
// Call to indicate that the window the tabcontents are in has changed its
// activation state.
void BrowserActivationStateChanged();
@@ -105,9 +99,6 @@ class BrowserLauncherItemController : public LauncherItemController,
content::WebContents* new_contents,
int index) OVERRIDE;
- // LauncherFaviconLoader::Delegate overrides:
- virtual void FaviconUpdated() OVERRIDE;
-
// aura::WindowObserver overrides:
virtual void OnWindowPropertyChanged(aura::Window* window,
const void* key,
@@ -146,9 +137,6 @@ class BrowserLauncherItemController : public LauncherItemController,
// Whether this is associated with an incognito profile.
const bool is_incognito_;
- // Loads launcher sized favicons for panels.
- scoped_ptr<LauncherFaviconLoader> favicon_loader_;
-
DISALLOW_COPY_AND_ASSIGN(BrowserLauncherItemController);
};
« no previous file with comments | « chrome/browser/extensions/window_open_apitest.cc ('k') | chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698