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

chrome/browser/ui/intents/web_intent_picker_controller.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/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 401 matching lines @@
   ClosePicker();
 }
 
 void WebIntentPickerController::OnChooseAnotherService() {
   DCHECK(intents_dispatcher_);
 
   intents_dispatcher_->ResetDispatch();
 }
 
 void WebIntentPickerController::OnClosing() {
-  picker_shown_ = false;
+  SetDialogState(kPickerHidden);
   picker_ = NULL;
 }
 
 void WebIntentPickerController::OnExtensionInstallSuccess(
     const std::string& extension_id) {
   // OnExtensionInstallSuccess is called via NotificationService::Notify before
   // the extension is added to the ExtensionService. Dispatch via PostTask to
   // allow ExtensionService to update.
   MessageLoop::current()->PostTask(
       FROM_HERE,
@@ skipping 447 matching lines @@
 void WebIntentPickerController::SetDialogState(WebIntentPickerState state) {
   // Ignore events that don't change state.
   if (state == dialog_state_)
     return;
 
   // Any pending timers are abandoned on state changes.
   timer_factory_.InvalidateWeakPtrs();
 
   switch (state) {
     case kPickerSetup:
-      DCHECK(dialog_state_ == kPickerHidden);
-
+      DCHECK_EQ(dialog_state_, kPickerHidden);
       // Post timer CWS pending
       MessageLoop::current()->PostDelayedTask(FROM_HERE,
           base::Bind(&WebIntentPickerController::OnPickerEvent,
                      timer_factory_.GetWeakPtr(),
                      kPickerEventHiddenSetupTimeout),
           base::TimeDelta::FromMilliseconds(kMaxHiddenSetupTimeMs));
       break;
 
     case kPickerWaiting:
-      DCHECK(dialog_state_ == kPickerSetup);
+      DCHECK_EQ(dialog_state_, kPickerSetup);
       // Waiting dialog can be dismissed after minimum wait time.
       MessageLoop::current()->PostDelayedTask(FROM_HERE,
           base::Bind(&WebIntentPickerController::OnPickerEvent,
                      timer_factory_.GetWeakPtr(),
                      kPickerEventMaxWaitTimeExceeded),
           base::TimeDelta::FromMilliseconds(kMinThrobberDisplayTimeMs));
       break;
 
     case kPickerWaitLong:
-      DCHECK(dialog_state_ == kPickerWaiting);
+      DCHECK_EQ(dialog_state_, kPickerWaiting);
       break;
 
     case kPickerMain:
       // No DCHECK - main state can be reached from any state.
       // Ready to display data.
       picker_model_->SetWaitingForSuggestions(false);
       break;
 
     case kPickerHidden:
       Reset();
@@ skipping 20 matching lines @@
   picker_->SetActionString(GetIntentActionString(
       UTF16ToUTF8(picker_model_->action())));
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   SetDialogState(kPickerHidden);
   if (picker_)
     picker_->Close();
 }