Do not flash the picker for 1 second when going directly to inline disposition

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 996 matching lines @@
   }
 
   // TODO(gbillock): this is a bit hacky and exists because in the inline case,
   // the picker currently assumes it exists.
   AddServiceToModel(service);
   picker_model_->set_show_use_another_service(false);
 
   if (service.disposition ==
       webkit_glue::WebIntentServiceData::DISPOSITION_INLINE) {
     picker_model_->SetInlineDisposition(service.service_url);
-    dialog_state_ = kPickerInline;
-    CreatePicker();
+    SetDialogState(kPickerInline);
     return;
   }
 
   OnServiceChosen(service.service_url, service.disposition, kSuppressDefaults);
 }
 
 void WebIntentPickerController::InvokeService(
     const WebIntentPickerModel::InstalledService& service) {
   if (service.disposition ==
       webkit_glue::WebIntentServiceData::DISPOSITION_INLINE) {
     // This call will ensure the picker dialog is created and initialized.
+    picker_model_->SetInlineDisposition(service.url);
     SetDialogState(kPickerInline);
+    return;
   }
   OnServiceChosen(service.url, service.disposition, kEnableDefaults);
 }
 
 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.
@@ skipping 74 matching lines @@
   content::DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(profile);
   if (!download_manager)
     return;
   content::DownloadItem* item =
       download_manager->GetDownload(download_id_.local());
   if (item)
     item->Cancel(true);
   download_id_ = content::DownloadId();
 }