[MD] Fix clipping of infobar child elements (particularly close button).

chrome/browser/ui/views/dropdown_bar_host.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 "chrome/browser/ui/views/dropdown_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/theme_copying_widget.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
 
 // static
 bool DropdownBarHost::disable_animations_during_testing_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropdownBarHost, public:
 
 DropdownBarHost::DropdownBarHost(BrowserView* browser_view)
     : browser_view_(browser_view),
-      clip_view_(new views::View()),
-      view_(NULL),
-      delegate_(NULL),
-      focus_manager_(NULL),
+      view_(nullptr),
+      delegate_(nullptr),
+      focus_manager_(nullptr),
       esc_accel_target_registered_(false),
-      is_visible_(false) {
-  // The |clip_view_| must paint to a layer so that it can clip descendent Views
-  // which also paint to a Layer.
-  clip_view_->SetPaintToLayer(true);
-  clip_view_->SetFillsBoundsOpaquely(false);
-  clip_view_->layer()->SetMasksToBounds(true);
-}
+      is_visible_(false) {}
 
 void DropdownBarHost::Init(views::View* host_view,
                            views::View* view,
                            DropdownBarHostDelegate* delegate) {
   DCHECK(view);
   DCHECK(delegate);
 
   view_ = view;
   delegate_ = delegate;
 
+  // The |clip_view| exists to paint to a layer so that it can clip descendent
+  // Views which also paint to a Layer.
+  scoped_ptr<views::View> clip_view(new views::View());
+  clip_view->SetPaintToLayer(true);
+  clip_view->SetFillsBoundsOpaquely(false);
+  clip_view->layer()->SetMasksToBounds(true);
+  clip_view->AddChildView(view_);
+
   // Initialize the host.
   host_.reset(new ThemeCopyingWidget(browser_view_->GetWidget()));
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = browser_view_->GetWidget()->GetNativeView();
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   host_->Init(params);
-  host_->SetContentsView(clip_view_);
-  clip_view_->AddChildView(view_);
+  host_->SetContentsView(clip_view.release());
 
   SetHostViewNative(host_view);
 
   // Start listening to focus changes, so we can register and unregister our
   // own handler for Escape.
   focus_manager_ = host_->GetFocusManager();
   if (focus_manager_) {
     focus_manager_->AddFocusChangeListener(this);
   } else {
     // In some cases (see bug http://crbug.com/17056) it seems we may not have
@@ skipping 159 matching lines @@
       escape, ui::AcceleratorManager::kNormalPriority, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
   ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }