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

Unified Diff: chrome/browser/shell_integration.cc

Issue 200025: Allow the default browser check to return "unknown" and reflect that in the UI. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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/shell_integration.cc
===================================================================
--- chrome/browser/shell_integration.cc (revision 25499)
+++ chrome/browser/shell_integration.cc (working copy)
@@ -44,15 +44,15 @@
void ShellIntegration::DefaultBrowserWorker::ExecuteCheckDefaultBrowser() {
DCHECK(MessageLoop::current() == file_loop_);
- bool is_default = ShellIntegration::IsDefaultBrowser();
+ DefaultBrowserState state = ShellIntegration::IsDefaultBrowser();
ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
- &DefaultBrowserWorker::CompleteCheckDefaultBrowser, is_default));
+ &DefaultBrowserWorker::CompleteCheckDefaultBrowser, state));
}
void ShellIntegration::DefaultBrowserWorker::CompleteCheckDefaultBrowser(
- bool is_default) {
+ DefaultBrowserState state) {
DCHECK(MessageLoop::current() == ui_loop_);
- UpdateUI(is_default);
+ UpdateUI(state);
}
void ShellIntegration::DefaultBrowserWorker::ExecuteSetAsDefaultBrowser() {
@@ -70,10 +70,21 @@
}
}
-void ShellIntegration::DefaultBrowserWorker::UpdateUI(bool is_default) {
+void ShellIntegration::DefaultBrowserWorker::UpdateUI(
+ DefaultBrowserState state) {
if (observer_) {
- DefaultBrowserUIState state =
- is_default ? STATE_DEFAULT : STATE_NOT_DEFAULT;
- observer_->SetDefaultBrowserUIState(state);
+ switch (state) {
+ case NOT_DEFAULT_BROWSER:
+ observer_->SetDefaultBrowserUIState(STATE_NOT_DEFAULT);
+ break;
+ case IS_DEFAULT_BROWSER:
+ observer_->SetDefaultBrowserUIState(STATE_IS_DEFAULT);
+ break;
+ case UNKNOWN_DEFAULT_BROWSER:
+ observer_->SetDefaultBrowserUIState(STATE_UNKNOWN);
+ break;
+ default:
+ break;
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698