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

Unified Diff: chrome/browser/ui/ash/event_rewriter.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/event_rewriter.cc
diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc
index dcca61ebe813000230807ab156b99c161d5052e4..330d455b57c442e534217b848abd3616fcd294b4 100644
--- a/chrome/browser/ui/ash/event_rewriter.cc
+++ b/chrome/browser/ui/ash/event_rewriter.cc
@@ -29,7 +29,7 @@
#include "base/command_line.h"
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/login/base_login_display_host.h"
+#include "chrome/browser/chromeos/login/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
#include "chrome/common/chrome_switches.h"
@@ -388,7 +388,7 @@ void EventRewriter::GetRemappedModifierMasks(
// TODO(glotov): remove the following condition when we do not restart chrome
// when user logs in as guest. See Rewrite() for details.
if (chromeos::UserManager::Get()->IsLoggedInAsGuest() &&
- chromeos::BaseLoginDisplayHost::default_host()) {
+ chromeos::LoginDisplayHostImpl::default_host()) {
return;
}
@@ -457,7 +457,7 @@ bool EventRewriter::RewriteModifiers(ui::KeyEvent* event) {
// when user logs in as guest.
#if defined(OS_CHROMEOS)
if (chromeos::UserManager::Get()->IsLoggedInAsGuest() &&
- chromeos::BaseLoginDisplayHost::default_host())
+ chromeos::LoginDisplayHostImpl::default_host())
return false;
#endif // defined(OS_CHROMEOS)
const PrefService* pref_service =
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698