Force native frames to repaint when OnNCActivate is called. With a profile me...

views/window/window_win.cc

Index: views/window/window_win.cc
===================================================================
--- views/window/window_win.cc	(revision 74946)
+++ views/window/window_win.cc	(working copy)
@@ -854,18 +854,17 @@
 LRESULT WindowWin::OnNCActivate(BOOL active) {
   is_active_ = !!active;
 
-  // If we're not using the native frame, we need to force a synchronous repaint
-  // otherwise we'll be left in the wrong activation state until something else
-  // causes a repaint later.
-  if (!non_client_view_->UseNativeFrame()) {
-    // We can get WM_NCACTIVATE before we're actually visible. If we're not
-    // visible, no need to paint.
-    if (IsWindowVisible(GetNativeView())) {
-      non_client_view_->SchedulePaint();
-      // We need to force a paint now, as a user dragging a window will block
-      // painting operations while the move is in progress.
-      PaintNow(root_view_->GetScheduledPaintRect());
-    }
+  // We need to force a synchronous repaint, otherwise we'll be left in the
+  // wrong activation state until something else causes a repaint later.
+  // The native frame needs a repaint as well, in case a profile menu is being
+  // displayed.

[Ben Goodger (Google), 2011/02/17 17:22:09]

Please rewrite the last sentence as:

Both the native and non-native frames may render activation-state dependent UI.

+  // We can get WM_NCACTIVATE before we're actually visible. If we're not
+  // visible, no need to paint.
+  if (IsWindowVisible(GetNativeView())) {
+    non_client_view_->SchedulePaint();
+    // We need to force a paint now, as a user dragging a window will block
+    // painting operations while the move is in progress.
+    PaintNow(root_view_->GetScheduledPaintRect());
   }
 
   // If we're active again, we should be allowed to render as inactive, so