Revert 266042 "Automatically call OnNativeThemeChanged when a wi..."

trunk/src/ui/views/view.cc

Index: trunk/src/ui/views/view.cc
===================================================================
--- trunk/src/ui/views/view.cc	(revision 266071)
+++ trunk/src/ui/views/view.cc	(working copy)
@@ -217,9 +217,8 @@
 
   // If |view| has a parent, remove it from its parent.
   View* parent = view->parent_;
-  ui::NativeTheme* old_theme = NULL;
+  const ui::NativeTheme* old_theme = view->GetNativeTheme();
   if (parent) {
-    old_theme = view->GetNativeTheme();
     if (parent == this) {
       ReorderChildView(view, index);
       return;
@@ -234,13 +233,6 @@
   view->parent_ = this;
   children_.insert(children_.begin() + index, view);
 
-  views::Widget* widget = GetWidget();
-  if (widget) {
-    const ui::NativeTheme* new_theme = view->GetNativeTheme();
-    if (new_theme != old_theme)
-      view->PropagateNativeThemeChanged(new_theme);
-  }
-
   ViewHierarchyChangedDetails details(true, this, view, parent);
 
   for (View* v = this; v; v = v->parent_)
@@ -248,9 +240,12 @@
 
   view->PropagateAddNotifications(details);
   UpdateTooltip();
+  views::Widget* widget = GetWidget();
   if (widget) {
     RegisterChildrenForVisibleBoundsNotification(view);
-
+    const ui::NativeTheme* new_theme = widget->GetNativeTheme();
+    if (new_theme != old_theme)
+      PropagateNativeThemeChanged(new_theme);
     if (view->visible())
       view->SchedulePaint();
   }