Corrects ContentSettingBubbleContents to show bubble with arrow when animation is paused

chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_strings.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
@@ skipping 132 matching lines @@
        it != media_menus_.end(); ++it) {
     if (it->second->type == type) {
       it->first->SetText(base::UTF8ToUTF16(label));
       it->first->Layout();
       return;
     }
   }
   NOTREACHED();
 }
 
+views::Widget* ContentSettingBubbleContents::Show(bool show_arrow) {
+  views::Widget* widget = views::BubbleDelegateView::CreateBubble(this);
+  // In the USER_GESTURE case, the icon will be in an active state so the
+  // bubble doesn't need an arrow.
+  if (ui::MaterialDesignController::IsModeMaterial() && !show_arrow)
+    SetArrowPaintType(views::BubbleBorder::PAINT_TRANSPARENT);
+  widget->Show();
+  return widget;
+}
+
 void ContentSettingBubbleContents::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   const int kSingleColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kSingleColumnSetId);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
@@ skipping 302 matching lines @@
   // Make sure the width is at least kMinMediaMenuButtonWidth. The
   // maximum width will be clamped by kMaxContentsWidth of the view.
   menu_width = std::max(kMinMediaMenuButtonWidth, menu_width + margins);
 
   for (MediaMenuPartsMap::const_iterator i = media_menus_.begin();
        i != media_menus_.end(); ++i) {
     i->first->SetMinSize(gfx::Size(menu_width, 0));
     i->first->SetMaxSize(gfx::Size(menu_width, 0));
   }
 }