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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-add-supervised-user
Patch Set: Address comments Created 4 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/chromeos/accessibility/accessibility_manager.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "base/strings/string_split.h" 30 #include "base/strings/string_split.h"
31 #include "base/strings/string_util.h" 31 #include "base/strings/string_util.h"
32 #include "base/time/time.h" 32 #include "base/time/time.h"
33 #include "base/values.h" 33 #include "base/values.h"
34 #include "chrome/browser/accessibility/accessibility_extension_api.h" 34 #include "chrome/browser/accessibility/accessibility_extension_api.h"
35 #include "chrome/browser/browser_process.h" 35 #include "chrome/browser/browser_process.h"
36 #include "chrome/browser/chrome_notification_types.h" 36 #include "chrome/browser/chrome_notification_types.h"
37 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 37 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
38 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 38 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
39 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 39 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
40 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
41 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 40 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
42 #include "chrome/browser/chromeos/profiles/profile_helper.h" 41 #include "chrome/browser/chromeos/profiles/profile_helper.h"
43 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" 42 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
44 #include "chrome/browser/extensions/api/braille_display_private/stub_braille_con troller.h" 43 #include "chrome/browser/extensions/api/braille_display_private/stub_braille_con troller.h"
45 #include "chrome/browser/extensions/component_loader.h" 44 #include "chrome/browser/extensions/component_loader.h"
46 #include "chrome/browser/extensions/extension_service.h" 45 #include "chrome/browser/extensions/extension_service.h"
47 #include "chrome/browser/extensions/tab_helper.h" 46 #include "chrome/browser/extensions/tab_helper.h"
48 #include "chrome/browser/prefs/incognito_mode_prefs.h" 47 #include "chrome/browser/prefs/incognito_mode_prefs.h"
49 #include "chrome/browser/profiles/profile.h" 48 #include "chrome/browser/profiles/profile.h"
50 #include "chrome/browser/profiles/profile_manager.h" 49 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 void AccessibilityManager::LoadChromeVoxToUserScreen( 629 void AccessibilityManager::LoadChromeVoxToUserScreen(
631 const base::Closure& done_cb) { 630 const base::Closure& done_cb) {
632 if (chrome_vox_loaded_on_user_screen_) 631 if (chrome_vox_loaded_on_user_screen_)
633 return; 632 return;
634 633
635 // Determine whether an OOBE screen is currently being shown. If so, 634 // Determine whether an OOBE screen is currently being shown. If so,
636 // ChromeVox will be injected directly into that screen. 635 // ChromeVox will be injected directly into that screen.
637 content::WebUI* login_web_ui = NULL; 636 content::WebUI* login_web_ui = NULL;
638 637
639 if (ProfileHelper::IsSigninProfile(profile_)) { 638 if (ProfileHelper::IsSigninProfile(profile_)) {
640 LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host(); 639 LoginDisplayHost* login_display_host = LoginDisplayHost::default_host();
641 if (login_display_host) { 640 if (login_display_host) {
642 WebUILoginView* web_ui_login_view = 641 WebUILoginView* web_ui_login_view =
643 login_display_host->GetWebUILoginView(); 642 login_display_host->GetWebUILoginView();
644 if (web_ui_login_view) 643 if (web_ui_login_view)
645 login_web_ui = web_ui_login_view->GetWebUI(); 644 login_web_ui = web_ui_login_view->GetWebUI();
646 } 645 }
647 646
648 // Lock screen uses the signin progile. 647 // Lock screen uses the signin progile.
649 chrome_vox_loaded_on_lock_screen_ = true; 648 chrome_vox_loaded_on_lock_screen_ = true;
650 } 649 }
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 content::BrowserContext* context) { 1232 content::BrowserContext* context) {
1234 keyboard_listener_extension_id_ = id; 1233 keyboard_listener_extension_id_ = id;
1235 1234
1236 extensions::ExtensionRegistry* registry = 1235 extensions::ExtensionRegistry* registry =
1237 extensions::ExtensionRegistry::Get(context); 1236 extensions::ExtensionRegistry::Get(context);
1238 if (!extension_registry_observer_.IsObserving(registry) && !id.empty()) 1237 if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
1239 extension_registry_observer_.Add(registry); 1238 extension_registry_observer_.Add(registry);
1240 } 1239 }
1241 1240
1242 } // namespace chromeos 1241 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698