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

Unified Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 8289022: Wires keeping the launcher up to date with the browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years, 2 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
« no previous file with comments | « chrome/browser/ui/aura/launcher_icon_updater.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « chrome/browser/ui/aura/launcher_icon_updater.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698