Revert 75306 - Force native frames to repaint when OnNCActivate is called. Wi...

views/window/window_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/window/window_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "base/i18n/rtl.h"
@@ skipping 836 matching lines @@
     }
   }
 
   if (process_mouse_exited)
     ProcessMouseExited();
 }
 
 LRESULT WindowWin::OnNCActivate(BOOL active) {
   is_active_ = !!active;
 
-  // We need to force a synchronous repaint, otherwise we'll be left in the
-  // wrong activation state until something else causes a repaint later.
-  // 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 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());
+    }
   }
 
   // If we're active again, we should be allowed to render as inactive, so
   // tell the non-client view. This must be done independently of the check for
   // disable_inactive_rendering_ since that check is valid even if the frame
   // is not active, but this can only be done if we've become active.
   if (IsActive())
     non_client_view_->DisableInactiveRendering(false);
 
   // Reset the disable inactive rendering state since activation has changed.
@@ skipping 775 matching lines @@
   Window::CloseSecondaryWidget(root_view->GetWidget());
   return TRUE;
 }
 }  // namespace
 
 void Window::CloseAllSecondaryWindows() {
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 }
 
 }  // namespace views