Fix html select tag on 2nd display.

content/browser/web_contents/web_contents_view_aura.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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
@@ skipping 240 matching lines @@
 }
 
 }  // namespace
 
 class WebContentsViewAura::WindowObserver
     : public aura::WindowObserver, public aura::RootWindowObserver {
  public:
   explicit WindowObserver(WebContentsViewAura* view)
       : view_(view),
         parent_(NULL) {
+    view_->window_->AddObserver(this);
   }
 
   virtual ~WindowObserver() {
+    view_->window_->RemoveObserver(this);
     if (parent_)
       parent_->RemoveObserver(this);
   }
 
   // Overridden from aura::WindowObserver:
   virtual void OnWindowParentChanged(aura::Window* window,
                                      aura::Window* parent) OVERRIDE {
+    if (window == parent_)
+      return;
     if (parent_)
       parent_->RemoveObserver(this);
     parent_ = parent;
     if (parent)
       parent->AddObserver(this);
   }
 
   virtual void OnWindowBoundsChanged(aura::Window* window,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) {
-    // This is for the Ash case.

[oshima, 2012/11/20 23:21:03]

This is necessary for non ash as well. WebContentView can move when you turn
on/off bookmark bar, or info bar.

     SendScreenRects();
   }
 
   virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE {
-    window->GetRootWindow()->AddRootWindowObserver(this);
+    if (window != parent_)
+      window->GetRootWindow()->AddRootWindowObserver(this);
   }
 
   virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE {
-    window->GetRootWindow()->RemoveRootWindowObserver(this);
+    if (window != parent_)
+      window->GetRootWindow()->RemoveRootWindowObserver(this);
   }
 
   // Overridden RootWindowObserver:
   virtual void OnRootWindowMoved(const aura::RootWindow* root,
                                  const gfx::Point& new_origin) OVERRIDE {
     // This is for the desktop case (i.e. Aura desktop).
     SendScreenRects();
   }
 
  private:
@@ skipping 30 matching lines @@
       completed_overscroll_gesture_(OVERSCROLL_NONE) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, private:
 
 WebContentsViewAura::~WebContentsViewAura() {
   if (!window_)
     return;
 
-  window_->RemoveObserver(window_observer_.get());
+  window_observer_.reset();
   // Window needs a valid delegate during its destructor, so we explicitly
   // delete it here.
   window_.reset();
 }
 
 void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) {
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
   RenderWidgetHostView* rwhv =
       web_contents_->GetRenderWidgetHostView();
@@ skipping 145 matching lines @@
   window_.reset(new aura::Window(this));
   window_->set_owned_by_parent(false);
   window_->SetType(aura::client::WINDOW_TYPE_CONTROL);
   window_->SetTransparent(false);
   window_->Init(ui::LAYER_NOT_DRAWN);
   window_->SetParent(NULL);
   window_->layer()->SetMasksToBounds(true);
   window_->SetName("WebContentsViewAura");
 
   window_observer_.reset(new WindowObserver(this));
-  window_->AddObserver(window_observer_.get());
 
   // delegate_->GetDragDestDelegate() creates a new delegate on every call.
   // Hence, we save a reference to it locally. Similar model is used on other
   // platforms as well.
   if (delegate_.get())
     drag_dest_delegate_ = delegate_->GetDragDestDelegate();
 }
 
 RenderWidgetHostView* WebContentsViewAura::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
@@ skipping 462 matching lines @@
       event.location(),
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   current_drop_data_.reset();
   return current_drag_op_;
 }
 
 }  // namespace content