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

Side by Side Diff: chrome/browser/signin/signin_error_notifier_ash.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/signin/signin_error_notifier_ash.h" 5 #include "chrome/browser/signin/signin_error_notifier_ash.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/system_notifier.h" 9 #include "ash/system/system_notifier.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 chrome::AttemptUserExit(); 95 chrome::AttemptUserExit();
96 #else 96 #else
97 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_); 97 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_);
98 if (login_ui->current_login_ui()) { 98 if (login_ui->current_login_ui()) {
99 login_ui->current_login_ui()->FocusUI(); 99 login_ui->current_login_ui()->FocusUI();
100 return; 100 return;
101 } 101 }
102 102
103 // Find a browser instance or create one. 103 // Find a browser instance or create one.
104 chrome::ScopedTabbedBrowserDisplayer browser_displayer( 104 chrome::ScopedTabbedBrowserDisplayer browser_displayer(
105 profile_, chrome::HOST_DESKTOP_TYPE_ASH); 105 profile_, ui::HOST_DESKTOP_TYPE_ASH);
106 106
107 // Navigate to the sync setup subpage, which will launch a login page. 107 // Navigate to the sync setup subpage, which will launch a login page.
108 chrome::ShowSettingsSubPage(browser_displayer.browser(), 108 chrome::ShowSettingsSubPage(browser_displayer.browser(),
109 chrome::kSyncSetupSubPage); 109 chrome::kSyncSetupSubPage);
110 #endif 110 #endif
111 } 111 }
112 112
113 } // namespace 113 } // namespace
114 114
115 SigninErrorNotifier::SigninErrorNotifier(SigninErrorController* controller, 115 SigninErrorNotifier::SigninErrorNotifier(SigninErrorController* controller,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 return l10n_util::GetStringUTF16( 212 return l10n_util::GetStringUTF16(
213 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE); 213 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE);
214 break; 214 break;
215 215
216 // Generic message for "other" errors. 216 // Generic message for "other" errors.
217 default: 217 default:
218 return l10n_util::GetStringUTF16( 218 return l10n_util::GetStringUTF16(
219 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE); 219 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE);
220 } 220 }
221 } 221 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698