Index: chrome/browser/ui/views/frame/browser_view.h |
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h |
index 3c519ad74f6c6d2a82038135f04ec23b8043049a..b9a8b5f4f4d0dac57c80baed694c55e3c6671b6f 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.h |
+++ b/chrome/browser/ui/views/frame/browser_view.h |
@@ -46,6 +46,7 @@ class BrowserViewLayout; |
class ContentsContainer; |
class DownloadShelfView; |
class EncodingMenuModel; |
+class Extension; |
class FullscreenExitBubbleViews; |
class HtmlDialogUIDelegate; |
class InfoBarContainerView; |
@@ -56,13 +57,16 @@ class TabContentsContainer; |
class TabStripModel; |
class ToolbarView; |
class ZoomMenuModel; |
-class Extension; |
#if defined(OS_WIN) |
class AeroPeekManager; |
class JumpList; |
#endif |
+#if defined(USE_AURA) |
+class LauncherIconUpdater; |
+#endif |
+ |
namespace views { |
class ExternalFocusTracker; |
class Menu; |
@@ -95,7 +99,7 @@ class BrowserView : public BrowserBubbleHost, |
void set_frame(BrowserFrame* frame) { frame_ = frame; } |
BrowserFrame* frame() const { return frame_; } |
-#if defined(OS_WIN) && !defined(USE_AURA) |
+#if defined(OS_WIN) || defined(USE_AURA) |
// Returns a pointer to the BrowserView* interface implementation (an |
// instance of this object, typically) for a given native window, or NULL if |
// there is no such association. |
@@ -680,6 +684,10 @@ class BrowserView : public BrowserBubbleHost, |
scoped_ptr<AeroPeekManager> aeropeek_manager_; |
#endif |
+#if defined(USE_AURA) |
+ scoped_ptr<LauncherIconUpdater> icon_updater_; |
+#endif |
+ |
// The timer used to update frames for the Loading Animation. |
base::RepeatingTimer<BrowserView> loading_animation_timer_; |