Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.cc

Issue 10870092: [WebIntents, Views] First version of "Waiting" dialog for views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Upload missing fix. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 64fdf2a93a62902570a86309b4ade165b9941808..8fa888e444d68bd5f15fc13fcb3325982ec84f7b 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -419,7 +419,7 @@ void WebIntentPickerController::OnChooseAnotherService() {
}
void WebIntentPickerController::OnClosing() {
- picker_shown_ = false;
+ SetDialogState(kPickerHidden);
picker_ = NULL;
}
@@ -887,8 +887,7 @@ void WebIntentPickerController::SetDialogState(WebIntentPickerState state) {
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,
@@ -898,7 +897,7 @@ void WebIntentPickerController::SetDialogState(WebIntentPickerState state) {
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,
@@ -908,7 +907,7 @@ void WebIntentPickerController::SetDialogState(WebIntentPickerState state) {
break;
case kPickerWaitLong:
- DCHECK(dialog_state_ == kPickerWaiting);
+ DCHECK_EQ(dialog_state_, kPickerWaiting);
break;
case kPickerMain:
« no previous file with comments | « no previous file | chrome/browser/ui/views/web_intent_picker_views.cc » ('j') | chrome/browser/ui/views/web_intent_picker_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698