Views - Fix text elision in content settings bubble's faux combobox

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>
@@ skipping 138 matching lines @@
 }
 
 ContentSettingBubbleContents::~ContentSettingBubbleContents() {
   STLDeleteValues(&media_menus_);
 }
 
 gfx::Size ContentSettingBubbleContents::GetPreferredSize() const {
   gfx::Size preferred_size(views::View::GetPreferredSize());
   int preferred_width =
       (!content_setting_bubble_model_->bubble_content().domain_lists.empty() &&
-       (kMinMultiLineContentsWidth > preferred_size.width())) ?
-      kMinMultiLineContentsWidth : preferred_size.width();
+       (kMinMultiLineContentsWidth > preferred_size.width()))
+          ? kMinMultiLineContentsWidth
+          : preferred_size.width();
   preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
   return preferred_size;
 }
 
 void ContentSettingBubbleContents::UpdateMenuLabel(
     content::MediaStreamType type,
     const std::string& label) {
   for (MediaMenuPartsMap::const_iterator it = media_menus_.begin();
        it != media_menus_.end(); ++it) {
     if (it->second->type == type) {
       it->first->SetText(base::UTF8ToUTF16(label));
+      it->first->Layout();
       return;
     }
   }
   NOTREACHED();
 }
 
 void ContentSettingBubbleContents::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new views::GridLayout(this);
@@ skipping 308 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));
   }
 }