Implement new gray mock.

BUG=chromium-os:14276
TEST=Login, examine both regular and OTR, and test with and without themes.

Review URL: http://codereview.chromium.org/6904160

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83729 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 9 deletions

diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc
index 021914f..5830d73 100644
--- a/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -168,6 +168,11 @@ void NonClientView::ViewHierarchyChanged(bool is_add, View* parent,
   }
 }
 
+void NonClientView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_WINDOW;
+  state->name = accessible_name_;
+}
+
 views::View* NonClientView::GetEventHandlerForPoint(const gfx::Point& point) {
   // Because of the z-ordering of our child views (the client view is positioned
   // over the non-client frame view, if the client view ever overlaps the frame
@@ -184,11 +189,6 @@ views::View* NonClientView::GetEventHandlerForPoint(const gfx::Point& point) {
   return View::GetEventHandlerForPoint(point);
 }
 
-void NonClientView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_WINDOW;
-  state->name = accessible_name_;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
diff --git a/views/window/non_client_view.h b/views/window/non_client_view.h
index b0b9137..d678571 100644
--- a/views/window/non_client_view.h
+++ b/views/window/non_client_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -218,12 +218,13 @@ class NonClientView : public View {
   virtual void Layout() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
+  virtual views::View* GetEventHandlerForPoint(const gfx::Point& point)
+      OVERRIDE;
+
  protected:
   // NonClientView, View overrides:
   virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
       OVERRIDE;
-  virtual views::View* GetEventHandlerForPoint(const gfx::Point& point)
-      OVERRIDE;
 
  private:
   // The frame that hosts this NonClientView.
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 1fee254a..0e7a6f2 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -411,6 +411,7 @@ void WindowGtk::FrameTypeChanged() {
   // This is called when the Theme has changed, so forward the event to the root
   // widget.
   ThemeChanged();
+  GetRootView()->SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////