[WebIntents, Views] First version of "Waiting" dialog for views.

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/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
@@ skipping 62 matching lines @@
 const int kThrobberFrameTimeMs = 50;
 
 // Enables or disables all child views of |view|.
 void EnableChildViews(views::View* view, bool enabled) {
   for (int i = 0; i < view->child_count(); ++i) {
     views::View* child = view->child_at(i);
     child->SetEnabled(enabled);
   }
 }
 
+// Create a "close" button.
+views::ImageButton* CreateCloseButton(views::ButtonListener* listener) {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  views::ImageButton* close_button = new views::ImageButton(listener);
+  close_button->SetImage(views::CustomButton::BS_NORMAL,
+                         rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X));
+  close_button->SetImage(views::CustomButton::BS_HOT,
+                         rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
+  close_button->SetImage(views::CustomButton::BS_PUSHED,
+                         rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
+  return close_button;
+}
+
 // StarsView -------------------------------------------------------------------
 
 // A view that displays 5 stars: empty, full or half full, given a rating in
 // the range [0,5].
 class StarsView : public views::View {
  public:
   explicit StarsView(double rating);
   virtual ~StarsView();
 
  private:
@@ skipping 131 matching lines @@
   this_frame_ = gfx::ImageSkiaOperations::ExtractSubset(*frames_, subset_rect);
   return this_frame_;
 }
 
 void ThrobberNativeTextButton::Run() {
   DCHECK(running_);
 
   SchedulePaint();
 }
 
+// WaitingView ----------------------------------------------------------
+class WaitingView : public views::View {
+ public:
+  WaitingView(views::ButtonListener* listener, bool use_close_button);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WaitingView);
+};
+
+WaitingView::WaitingView(views::ButtonListener* listener,
+                         bool use_close_button) {
+  views::GridLayout* layout = new views::GridLayout(this);
+  layout->set_minimum_size(gfx::Size(WebIntentPicker::kWindowWidth, 0));
+  layout->SetInsets(WebIntentPicker::kContentAreaBorder,
+                    WebIntentPicker::kContentAreaBorder,
+                    WebIntentPicker::kContentAreaBorder,
+                    WebIntentPicker::kContentAreaBorder);
+  SetLayoutManager(layout);
+
+  views::ColumnSet* cs = layout->AddColumnSet(0);
+  views::ColumnSet* header_cs = NULL;

[tfarina, 2012/08/29 01:04:01]

looks like this could be moved inside the if clause below.

+  if (use_close_button) {
+    header_cs = layout->AddColumnSet(1);
+    header_cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing);
+    header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
+                         GridLayout::USE_PREF, 0, 0);  // Close Button.
+  }
+  cs->AddPaddingColumn(0, views::kPanelHorizIndentation);
+  cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER,
+                1, GridLayout::USE_PREF, 0, 0);
+  cs->AddPaddingColumn(0, views::kPanelHorizIndentation);
+
+  // Create throbber.
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  const gfx::ImageSkia* frames =
+      rb.GetImageNamed(IDR_SPEECH_INPUT_SPINNER).ToImageSkia();
+  views::Throbber* throbber = new views::Throbber(kThrobberFrameTimeMs, true);
+  throbber->SetFrames(frames);
+  throbber->Start();
+
+  // Create text.
+  views::Label* label = new views::Label();
+  label->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
+  label->SetFont(rb.GetFont(ui::ResourceBundle::MediumBoldFont));
+  label->SetText(l10n_util::GetStringUTF16(IDS_INTENT_PICKER_WAIT_FOR_CWS));
+
+  // Layout the view.
+  if (use_close_button) {
+    layout->StartRow(0, 1);
+    layout->AddView(CreateCloseButton(listener));
+  }
+
+  layout->AddPaddingRow(0, views::kUnrelatedControlLargeVerticalSpacing);
+  layout->StartRow(0, 0);
+  layout->AddView(throbber);
+  layout->AddPaddingRow(0, views::kUnrelatedControlLargeVerticalSpacing);
+  layout->StartRow(0, 0);
+  layout->AddView(label);
+  layout->AddPaddingRow(0, views::kUnrelatedControlLargeVerticalSpacing);
+}
+
 // ServiceButtonsView ----------------------------------------------------------
 
 // A view that contains all service buttons (i.e. the installed services).
 class ServiceButtonsView : public views::View,
                            public views::ButtonListener {
  public:
   class Delegate {
    public:
     // Called when a service button is clicked. |index| is the index of the
     // service button in the model.
@@ skipping 454 matching lines @@
 
   // SuggestedExtensionsRowView::Delegate implementation.
   virtual void OnExtensionInstallClicked(const string16& extension_id) OVERRIDE;
   virtual void OnExtensionLinkClicked(const string16& extension_id) OVERRIDE;
 
  private:
   // Initialize the contents of the picker. After this call, contents_ will be
   // non-NULL.
   void InitContents();
 
+  // Initialize the main contents of the picker. (Suggestions, services).
+  void InitMainContents();
+
   // Restore the contents of the picker to the initial contents.
   void ResetContents();
 
   // Resize the constrained window to the size of its contents.
   void SizeToContents();
 
-  // Returns a new close button.
-  views::ImageButton* CreateCloseButton();
-
   // A weak pointer to the WebIntentPickerDelegate to notify when the user
   // chooses a service or cancels.
   WebIntentPickerDelegate* delegate_;
 
   // A weak pointer to the picker model.
   WebIntentPickerModel* model_;
 
   // A weak pointer to the service button view.
   // Created locally, owned by Views.
   ServiceButtonsView* service_buttons_;
@@ skipping 29 matching lines @@
   ConstrainedWindowViews* window_;
 
   // A weak pointer to the more suggestions link.
   // Created locally, owned by Views.
   views::Link* more_suggestions_link_;
 
   // A weak pointer to the choose another service link.
   // Created locally, owned by Views.
   views::Link* choose_another_service_link_;
 
+  // Weak pointer to "Waiting for CWS" display. Owned by parent view.
+  WaitingView* waiting_view_;
+
   // Set to true when displaying the inline disposition web contents. Used to
   // prevent laying out the inline disposition widgets twice.
   bool displaying_web_contents_;
 
   // The text for the current action.
   string16 action_text_;
 
   // Ownership of the WebContents we are displaying in the inline disposition.
   scoped_ptr<WebContents> inline_web_contents_;
 
@@ skipping 20 matching lines @@
       service_buttons_(NULL),
       action_label_(NULL),
       suggestions_label_(NULL),
       extensions_(NULL),
       tab_contents_(tab_contents),
       webview_(new views::WebView(tab_contents->profile())),
       contents_(NULL),
       window_(NULL),
       more_suggestions_link_(NULL),
       choose_another_service_link_(NULL),
+      waiting_view_(NULL),
       displaying_web_contents_(false) {
   use_close_button_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableFramelessConstrainedDialogs);
 
   model_->set_observer(this);
   InitContents();
 
   // Show the dialog.
   window_ = new ConstrainedWindowViews(tab_contents, this);
 }
@@ skipping 42 matching lines @@
     NOTREACHED();
   }
 }
 
 void WebIntentPickerViews::Close() {
   window_->CloseConstrainedWindow();
 }
 
 void WebIntentPickerViews::SetActionString(const string16& action) {
   action_text_ = action;
-  action_label_->SetText(action);
+
+  if (action_label_)
+    action_label_->SetText(action);
 }
 
 void WebIntentPickerViews::OnExtensionInstallSuccess(const std::string& id) {
 }
 
 void WebIntentPickerViews::OnExtensionInstallFailure(const std::string& id) {
   service_buttons_->SetEnabled(true);
   extensions_->StopThrobber();
   more_suggestions_link_->SetEnabled(true);
   contents_->Layout();
@@ skipping 103 matching lines @@
   // or if more than one (the current) service is installed.
   if (model_->GetInstalledServiceCount() > 1 ||
        model_->GetSuggestedExtensionCount()) {
     choose_another_service_link_ = new views::Link(
         l10n_util::GetStringUTF16(IDS_INTENT_PICKER_USE_ALTERNATE_SERVICE));
     grid_layout->AddView(choose_another_service_link_);
     choose_another_service_link_->set_listener(this);
   }
 
   if (use_close_button_)
-    grid_layout->AddView(CreateCloseButton());
+    grid_layout->AddView(CreateCloseButton(this));
 
   // Inline web contents row.
   grid_layout->StartRow(0, 1);
   grid_layout->AddView(webview_, 1, 1, GridLayout::CENTER,
                        GridLayout::CENTER, 0, 0);
   contents_->Layout();
   SizeToContents();
   displaying_web_contents_ = true;
 }
 
 void WebIntentPickerViews::OnModelChanged(WebIntentPickerModel* model) {
-  string16 label_text = model->GetSuggestionsLinkText();
-  suggestions_label_->SetText(label_text);
+  if (waiting_view_ && !model->IsWaitingForSuggestions()) {

[tfarina, 2012/08/29 01:04:01]

no need of { } for single line statements.

+    InitMainContents();
+  }
+  if (suggestions_label_) {
+    string16 label_text = model->GetSuggestionsLinkText();
+    suggestions_label_->SetText(label_text);
+    suggestions_label_->SetVisible(!label_text.empty());
+  }
 
-  suggestions_label_->SetVisible(!label_text.empty());
+  if (service_buttons_)
+    service_buttons_->Update();
 
-  service_buttons_->Update();
-  extensions_->Update();
+  if (extensions_)
+    extensions_->Update();
   contents_->Layout();
   SizeToContents();
 }
 
 void WebIntentPickerViews::OnFaviconChanged(
     WebIntentPickerModel* model, size_t index) {
-  service_buttons_->Update();
+  if (service_buttons_)
+    service_buttons_->Update();
+
   contents_->Layout();
   SizeToContents();
 }
 
 void WebIntentPickerViews::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const string16& extension_id) {
-  extensions_->Update();
+  if (extensions_)
+    extensions_->Update();
+
   contents_->Layout();
   SizeToContents();
 }
 
 void WebIntentPickerViews::OnInlineDisposition(
     const string16&, const GURL& url) {
   if (!webview_)
     webview_ = new views::WebView(tab_contents_->profile());
 
   inline_web_contents_.reset(WebContents::Create(
@@ skipping 40 matching lines @@
   contents_->Layout();
   delegate_->OnExtensionInstallRequested(UTF16ToUTF8(extension_id));
 }
 
 void WebIntentPickerViews::OnExtensionLinkClicked(
     const string16& extension_id) {
   delegate_->OnExtensionLinkClicked(UTF16ToUTF8(extension_id));
 }
 
 void WebIntentPickerViews::InitContents() {
+  DCHECK(!contents_);
+  contents_ = new views::View();
+
+  if (model_ && model_->IsWaitingForSuggestions()) {
+    contents_->RemoveAllChildViews(true);
+    contents_->SetLayoutManager(new views::FillLayout());
+    waiting_view_ = new WaitingView(this, use_close_button_);
+    contents_->AddChildView(waiting_view_);
+    contents_->Layout();
+  } else {
+    InitMainContents();
+  }
+}
+
+void WebIntentPickerViews::InitMainContents() {
+  DCHECK(contents_);
   enum {
     kHeaderRowColumnSet,  // Column set for header layout.
     kFullWidthColumnSet,  // Column set with a single full-width column.
     kIndentedFullWidthColumnSet,  // Single full-width column, indented.
   };
 
-  if (contents_) {
-    // Replace the picker with the inline disposition.
-    contents_->RemoveAllChildViews(true);
-    displaying_web_contents_ = false;
-  } else {
-    contents_ = new views::View();
-  }
+  contents_->RemoveAllChildViews(true);
+  displaying_web_contents_ = false;
+
   views::GridLayout* grid_layout = new views::GridLayout(contents_);
   contents_->SetLayoutManager(grid_layout);
 
   grid_layout->set_minimum_size(gfx::Size(kWindowWidth, 0));
   grid_layout->SetInsets(kContentAreaBorder, kContentAreaBorder,
                          kContentAreaBorder, kContentAreaBorder);
   views::ColumnSet* header_cs = grid_layout->AddColumnSet(kHeaderRowColumnSet);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Title.
   header_cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing);
@@ skipping 15 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Header row.
   grid_layout->StartRow(0, kHeaderRowColumnSet);
   action_label_ = new views::Label();
   action_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   action_label_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   grid_layout->AddView(action_label_);
 
   if (use_close_button_)
-    grid_layout->AddView(CreateCloseButton());
+    grid_layout->AddView(CreateCloseButton(this));
 
   // 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.
@@ skipping 42 matching lines @@
   SizeToContents();
 }
 
 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);
   window_->CenterWindow(new_window_bounds.size());
 }
 

[tfarina, 2012/08/29 01:04:01]

please, remove these two empty lines.

-views::ImageButton* WebIntentPickerViews::CreateCloseButton() {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  views::ImageButton* close_button = new views::ImageButton(this);
-  close_button->SetImage(views::CustomButton::BS_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X));
-  close_button->SetImage(views::CustomButton::BS_HOT,
-                          rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
-  close_button->SetImage(views::CustomButton::BS_PUSHED,
-                          rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
-  return close_button;
-}
+