retry r266622:

ui/views/view_unittest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 185 matching lines @@
 
 }  // namespace
 
 namespace views {
 
 typedef ViewsTestBase ViewTest;
 
 // A derived class for testing purpose.
 class TestView : public View {
  public:
-  TestView() : View(), delete_on_pressed_(false) {}
+  TestView() : View(), delete_on_pressed_(false), native_theme_(NULL) {}
   virtual ~TestView() {}
 
   // Reset all test state
   void Reset() {
     did_change_bounds_ = false;
     last_mouse_event_type_ = 0;
     location_.SetPoint(0, 0);
     received_mouse_enter_ = false;
     received_mouse_exit_ = false;
     last_gesture_event_type_ = 0;
@@ skipping 20 matching lines @@
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
 
   // Ignores GestureEvent by default.
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   virtual void Paint(gfx::Canvas* canvas) OVERRIDE;
   virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
+  virtual void OnNativeThemeChanged(const ui::NativeTheme* native_theme)
+      OVERRIDE;
+
   // OnBoundsChanged.
   bool did_change_bounds_;
   gfx::Rect new_bounds_;
 
   // MouseEvent.
   int last_mouse_event_type_;
   gfx::Point location_;
   bool received_mouse_enter_;
   bool received_mouse_exit_;
   bool delete_on_pressed_;
 
   // Painting.
   std::vector<gfx::Rect> scheduled_paint_rects_;
 
   // GestureEvent
   int last_gesture_event_type_;
   bool last_gesture_event_was_handled_;
 
   // Painting.
   SkRect last_clip_;
 
   // Accelerators.
   std::map<ui::Accelerator, int> accelerator_count_map_;
+
+  // Native theme.
+  const ui::NativeTheme* native_theme_;
 };
 
 // A view subclass that consumes all Gesture events for testing purposes.
 class TestViewConsumeGesture : public TestView {
  public:
   TestViewConsumeGesture() : TestView() {}
   virtual ~TestViewConsumeGesture() {}
 
  protected:
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
@@ skipping 3332 matching lines @@
 TEST_F(ViewTest, UpdateViewStorageOnDelete) {
   ViewStorage* view_storage = ViewStorage::GetInstance();
   const int storage_id = view_storage->CreateStorageID();
   {
     View view;
     view_storage->StoreView(storage_id, &view);
   }
   EXPECT_TRUE(view_storage->RetrieveView(storage_id) == NULL);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NativeTheme
+////////////////////////////////////////////////////////////////////////////////
+
+void TestView::OnNativeThemeChanged(const ui::NativeTheme* native_theme) {
+  native_theme_ = native_theme;
+}
+
+TEST_F(ViewTest, OnNativeThemeChanged) {
+  TestView* test_view = new TestView();
+  EXPECT_FALSE(test_view->native_theme_);
+  TestView* test_view_child = new TestView();
+  EXPECT_FALSE(test_view_child->native_theme_);
+
+  // Child view added before the widget hierarchy exists should get the
+  // new native theme notification.
+  test_view->AddChildView(test_view_child);
+
+  scoped_ptr<Widget> widget(new Widget);
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  widget->Init(params);
+
+  widget->GetRootView()->AddChildView(test_view);
+  EXPECT_TRUE(test_view->native_theme_);
+  EXPECT_EQ(widget->GetNativeTheme(), test_view->native_theme_);
+  EXPECT_TRUE(test_view_child->native_theme_);
+  EXPECT_EQ(widget->GetNativeTheme(), test_view_child->native_theme_);
+
+  // Child view added after the widget hierarchy exists should also get the
+  // notification.
+  TestView* test_view_child_2 = new TestView();
+  test_view->AddChildView(test_view_child_2);
+  EXPECT_TRUE(test_view_child_2->native_theme_);
+  EXPECT_EQ(widget->GetNativeTheme(), test_view_child_2->native_theme_);
+
+  widget->CloseNow();
+}
+
 }  // namespace views