[Web Intents] Fix crash in views picker.

chrome/browser/ui/views/web_intent_picker_views.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 <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 172 matching lines @@
     : model_(model),
       delegate_(delegate) {
   Update();
 }
 
 ServiceButtonsView::~ServiceButtonsView() {
 }
 
 void ServiceButtonsView::Update() {
   RemoveAllChildViews(true);
+  views::GridLayout* grid_layout = new views::GridLayout(this);
+  SetLayoutManager(grid_layout);
+
   if (model_->GetInstalledServiceCount() == 0)
     return;
 
-  views::GridLayout* grid_layout = new views::GridLayout(this);
-  SetLayoutManager(grid_layout);
-
   views::ColumnSet* cs = grid_layout->AddColumnSet(0);
   cs->AddPaddingColumn(1, 0);
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 0,
       views::GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(1, 0);
 
   for (size_t i = 0; i < model_->GetInstalledServiceCount(); ++i) {
     const WebIntentPickerModel::InstalledService& service =
         model_->GetInstalledServiceAt(i);
 
@@ skipping 528 matching lines @@
 }
 
 void WebIntentPickerViews::SizeToContents() {
   gfx::Size client_size = contents_->GetPreferredSize();
   gfx::Rect client_bounds(client_size);
   gfx::Rect new_window_bounds = window_->non_client_view()->frame_view()->
       GetWindowBoundsForClientBounds(client_bounds);
   // TODO(binji): figure out how to get the constrained dialog centered...
   window_->SetSize(new_window_bounds.size());
 }