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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 14200033: [cros] Rename BaseLoginDisplayHost to LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/keyboard_overlay/keyboard_overlay_view.h" 7 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
8 #include "ash/system/chromeos/network/network_observer.h" 8 #include "ash/system/chromeos/network/network_observer.h"
9 #include "ash/system/tray/system_tray_notifier.h" 9 #include "ash/system/tray/system_tray_notifier.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 bool ChromeShellDelegate::IsSpokenFeedbackEnabled() const { 129 bool ChromeShellDelegate::IsSpokenFeedbackEnabled() const {
130 return chromeos::accessibility::IsSpokenFeedbackEnabled(); 130 return chromeos::accessibility::IsSpokenFeedbackEnabled();
131 } 131 }
132 132
133 void ChromeShellDelegate::ToggleSpokenFeedback( 133 void ChromeShellDelegate::ToggleSpokenFeedback(
134 ash::AccessibilityNotificationVisibility notify) { 134 ash::AccessibilityNotificationVisibility notify) {
135 content::WebUI* web_ui = NULL; 135 content::WebUI* web_ui = NULL;
136 136
137 chromeos::WebUILoginDisplayHost* host = 137 chromeos::WebUILoginDisplayHost* host =
138 static_cast<chromeos::WebUILoginDisplayHost*>( 138 static_cast<chromeos::WebUILoginDisplayHost*>(
139 chromeos::BaseLoginDisplayHost::default_host()); 139 chromeos::LoginDisplayHostImpl::default_host());
140 if (host && host->GetOobeUI()) 140 if (host && host->GetOobeUI())
141 web_ui = host->GetOobeUI()->web_ui(); 141 web_ui = host->GetOobeUI()->web_ui();
142 142
143 if (!web_ui && 143 if (!web_ui &&
144 chromeos::ScreenLocker::default_screen_locker() && 144 chromeos::ScreenLocker::default_screen_locker() &&
145 chromeos::ScreenLocker::default_screen_locker()->locked()) { 145 chromeos::ScreenLocker::default_screen_locker()->locked()) {
146 web_ui = chromeos::ScreenLocker::default_screen_locker()-> 146 web_ui = chromeos::ScreenLocker::default_screen_locker()->
147 GetAssociatedWebUI(); 147 GetAssociatedWebUI();
148 } 148 }
149 chromeos::accessibility::ToggleSpokenFeedback(web_ui, notify); 149 chromeos::accessibility::ToggleSpokenFeedback(web_ui, notify);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 } 253 }
254 254
255 void ChromeShellDelegate::PlatformInit() { 255 void ChromeShellDelegate::PlatformInit() {
256 registrar_.Add(this, 256 registrar_.Add(this,
257 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 257 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
258 content::NotificationService::AllSources()); 258 content::NotificationService::AllSources());
259 registrar_.Add(this, 259 registrar_.Add(this,
260 chrome::NOTIFICATION_SESSION_STARTED, 260 chrome::NOTIFICATION_SESSION_STARTED,
261 content::NotificationService::AllSources()); 261 content::NotificationService::AllSources());
262 } 262 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/ui/ash/event_rewriter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698