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

Unified Diff: chrome/browser/ui/views/bubble/bubble.h

Issue 8416053: Gets Bubble to work on aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make Layer::SetOpacity do ScheduleDraw 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 | « no previous file | chrome/browser/ui/views/bubble/bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bubble/bubble.h
diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h
index 5586bd2cba80720f31280165cabd0f58c94e533b..22402c520b08829a995b7daf9c2cf800d7d9a6d7 100644
--- a/chrome/browser/ui/views/bubble/bubble.h
+++ b/chrome/browser/ui/views/bubble/bubble.h
@@ -190,7 +190,7 @@ class Bubble
#if defined(USE_AURA)
// Overridden from NativeWidgetAura:
- // TODO(beng): OnActivate();
+ virtual void OnLostActive() OVERRIDE;
#elif defined(OS_WIN)
// Overridden from NativeWidgetWin:
virtual void OnActivate(UINT action, BOOL minimized, HWND window);
@@ -202,12 +202,10 @@ class Bubble
virtual void OnActiveChanged() OVERRIDE;
#endif
-#if defined(USE_AURA)
- // TODO(beng):
-#elif defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// The window used to render the padding, border and arrow.
BorderWidgetWin* border_;
-#elif defined(TOOLKIT_USES_GTK)
+#else
// The view displaying the border.
BorderContents* border_contents_;
#endif
« no previous file with comments | « no previous file | chrome/browser/ui/views/bubble/bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698