Merge 108537 - Align avatar bubble with edge of anchor control

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
@@ skipping 126 matching lines @@
   screen_bounds.set_origin(origin);
   Profile* profile = parent_->browser()->profile();
   ContentSettingBubbleContents* bubble_contents =
       new ContentSettingBubbleContents(
           ContentSettingBubbleModel::CreateContentSettingBubbleModel(
               parent_->browser(), tab_contents, profile,
               content_setting_image_model_->get_content_settings_type()),
           profile, tab_contents->tab_contents());
   bubble_ = Bubble::Show(GetWidget(), screen_bounds,
                          views::BubbleBorder::TOP_RIGHT,
+                         views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR,
                          bubble_contents, this);
   bubble_contents->set_bubble(bubble_);
 }
 
 void ContentSettingImageView::VisibilityChanged(View* starting_from,
                                                 bool is_visible) {
   if (!is_visible && bubble_)
     bubble_->Close();
 }
 
@@ skipping 79 matching lines @@
                                           kAnimatingFraction);
   } else if (state > (1.0 - kAnimatingFraction)) {
     visible_text_size_ = static_cast<int>(text_size_ * (1.0 - state) /
                                           kAnimatingFraction);
   } else {
     visible_text_size_ = text_size_;
   }
   parent_->Layout();
   parent_->SchedulePaint();
 }