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

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: 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
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 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 void AccessibilityManager::LoadChromeVoxToUserScreen( 628 void AccessibilityManager::LoadChromeVoxToUserScreen(
630 const base::Closure& done_cb) { 629 const base::Closure& done_cb) {
631 if (chrome_vox_loaded_on_user_screen_) 630 if (chrome_vox_loaded_on_user_screen_)
632 return; 631 return;
633 632
634 // Determine whether an OOBE screen is currently being shown. If so, 633 // Determine whether an OOBE screen is currently being shown. If so,
635 // ChromeVox will be injected directly into that screen. 634 // ChromeVox will be injected directly into that screen.
636 content::WebUI* login_web_ui = NULL; 635 content::WebUI* login_web_ui = NULL;
637 636
638 if (ProfileHelper::IsSigninProfile(profile_)) { 637 if (ProfileHelper::IsSigninProfile(profile_)) {
639 LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host(); 638 LoginDisplayHost* login_display_host = LoginDisplayHost::default_host();
640 if (login_display_host) { 639 if (login_display_host) {
641 WebUILoginView* web_ui_login_view = 640 WebUILoginView* web_ui_login_view =
642 login_display_host->GetWebUILoginView(); 641 login_display_host->GetWebUILoginView();
643 if (web_ui_login_view) 642 if (web_ui_login_view)
644 login_web_ui = web_ui_login_view->GetWebUI(); 643 login_web_ui = web_ui_login_view->GetWebUI();
645 } 644 }
646 645
647 // Lock screen uses the signin progile. 646 // Lock screen uses the signin progile.
648 chrome_vox_loaded_on_lock_screen_ = true; 647 chrome_vox_loaded_on_lock_screen_ = true;
649 } 648 }
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1205 chromevox_panel_ = nullptr; 1204 chromevox_panel_ = nullptr;
1206 ash::ShelfLayoutManager::ForShelf(root_window)->SetChromeVoxPanelHeight(0); 1205 ash::ShelfLayoutManager::ForShelf(root_window)->SetChromeVoxPanelHeight(0);
1207 } 1206 }
1208 1207
1209 void AccessibilityManager::OnChromeVoxPanelDestroying() { 1208 void AccessibilityManager::OnChromeVoxPanelDestroying() {
1210 chromevox_panel_widget_observer_.reset(nullptr); 1209 chromevox_panel_widget_observer_.reset(nullptr);
1211 chromevox_panel_ = nullptr; 1210 chromevox_panel_ = nullptr;
1212 } 1211 }
1213 1212
1214 } // namespace chromeos 1213 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698