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

Unified Diff: chrome/browser/ui/startup/default_browser_prompt.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 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/ui/startup/default_browser_prompt.cc
diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc
index 353c3c7bf6297306cd1dceb3d863ad00f86b0e93..ed6fb58d2202776bc31cb7b0f78eabf22e41f79e 100644
--- a/chrome/browser/ui/startup/default_browser_prompt.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt.cc
@@ -181,7 +181,7 @@ bool DefaultBrowserInfoBarDelegate::Cancel() {
return true;
}
-void NotifyNotDefaultBrowserCallback(chrome::HostDesktopType desktop_type) {
+void NotifyNotDefaultBrowserCallback(ui::HostDesktopType desktop_type) {
Browser* browser = chrome::FindLastActiveWithHostDesktopType(desktop_type);
if (!browser)
return; // Reached during ui tests.
@@ -212,7 +212,7 @@ void ResetCheckDefaultBrowserPrefOnUIThread(
void CheckDefaultBrowserOnFileThread(const base::FilePath& profile_path,
bool show_prompt,
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
ShellIntegration::DefaultWebClientState state =
ShellIntegration::GetDefaultBrowser();
@@ -243,7 +243,8 @@ void RegisterDefaultBrowserPromptPrefs(PrefRegistrySimple* registry) {
prefs::kBrowserSuppressDefaultBrowserPrompt, std::string());
}
-void ShowDefaultBrowserPrompt(Profile* profile, HostDesktopType desktop_type) {
+void ShowDefaultBrowserPrompt(Profile* profile,
+ ui::HostDesktopType desktop_type) {
// We do not check if we are the default browser if:
// - There is a policy in control of this setting.
// We check if we are the default browser but do not prompt if:

Powered by Google App Engine
This is Rietveld 408576698