chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc - Issue 14200033: [cros] Rename BaseLoginDisplayHost to LoginDisplayHostImpl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.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

« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_launcher.cc ('k') | chrome/browser/chromeos/login/base_login_display_host.h » ('j') | chrome/browser/chromeos/login/login_display_host_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc

diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc

index 4cf9bd181165133e9ac9049aa34c2a1629ce3d94..e4ab9a81e5535d4721d245c85404458b84561d22 100644

--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc

+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc

@@ -18,7 +18,7 @@

#include "chrome/browser/chromeos/drive/drive_system_service.h"

#include "chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h"

#include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.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/screen_locker.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/net/connectivity_state_helper.h"

@@ -719,7 +719,7 @@ void FileManagerEventRouter::ShowRemovableDeviceInFileManager(

const DiskMountManager::Disk& disk, const base::FilePath& mount_path) {

// Do not attempt to open File Manager while the login is in progress or

// the screen is locked.

- if (chromeos::BaseLoginDisplayHost::default_host() ||

+ if (chromeos::LoginDisplayHostImpl::default_host() ||

chromeos::ScreenLocker::default_screen_locker())

return;