[Views, WebIntents] Hide suggestion label if none are available.

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 "base/time.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 933 matching lines @@
   // Inline web contents row.
   grid_layout->StartRow(0, 1);
   grid_layout->AddView(webview_, 1, 1, GridLayout::CENTER,
                        GridLayout::CENTER, kDialogMinWidth, 140);
   contents_->Layout();
   SizeToContents();
   displaying_web_contents_ = true;
 }
 
 void WebIntentPickerViews::OnModelChanged(WebIntentPickerModel* model) {
   if (model->GetInstalledServiceCount() == 0) {

[Peter Kasting, 2012/05/16 22:09:27]

Nit: While here, shorter:

  suggestions_label_->SetText(l10n_util::GetStringUTF16(
      model->GetInstalledServiceCount() ?
      IDS_INTENT_PICKER_GET_MORE_SERVICES :
      IDS_INTENT_PICKER_GET_MORE_SERVICES_NONE_INSTALLED));

[groby-ooo-7-16, 2012/05/16 23:03:07]

Done.

     suggestions_label_->SetText(l10n_util::GetStringUTF16(
         IDS_INTENT_PICKER_GET_MORE_SERVICES_NONE_INSTALLED));
   } else {
     suggestions_label_->SetText(
         l10n_util::GetStringUTF16(IDS_INTENT_PICKER_GET_MORE_SERVICES));
   }
 
+  if (model->GetSuggestedExtensionCount() == 0)

[Peter Kasting, 2012/05/16 22:09:27]

Nit: Simpler:

  suggestions_label_->SetVisible(model->GetSuggestedExtensionCount() > 0);

[groby-ooo-7-16, 2012/05/16 23:03:07]

Done.

+    suggestions_label_->SetVisible(false);
+  else
+    suggestions_label_->SetVisible(true);
+
   service_buttons_->Update();
   extensions_->Update();
   contents_->Layout();
   SizeToContents();
 }
 
 void WebIntentPickerViews::OnFaviconChanged(
     WebIntentPickerModel* model, size_t index) {
   service_buttons_->Update();
   contents_->Layout();
@@ skipping 120 matching lines @@
   // Padding row.
   grid_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Service button row.
   grid_layout->StartRow(0, kFullWidthColumnSet);
   service_buttons_ = new ServiceButtonsView(model_, this);
   grid_layout->AddView(service_buttons_);
 
   // Row with app suggestions label.
   grid_layout->StartRow(0, kIndentedFullWidthColumnSet);
-  suggestions_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_INTENT_PICKER_GET_MORE_SERVICES));
+  suggestions_label_ = new views::Label();
+  suggestions_label_->SetVisible(false);
   suggestions_label_->SetMultiLine(true);
   suggestions_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   grid_layout->AddView(suggestions_label_);
 
   // Padding row.
   grid_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Row with extension suggestions.
   grid_layout->StartRow(0, kIndentedFullWidthColumnSet);
   extensions_ = new SuggestedExtensionsView(model_, this);
@@ skipping 45 matching lines @@
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR));
   close_button->SetImage(views::CustomButton::BS_HOT,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
   close_button->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
   return close_button;
 }
 #endif