chrome/browser/chromeos/login/user_manager_impl.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

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/login/user_manager_impl.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: _ Created 8 years, 9 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:

Index: chrome/browser/chromeos/login/user_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc

index a5800a51771b635d33e3d4b982e0c2b4a06f7acd..b221d832fe6e37064a329a75faa793f2d954c1ff 100644

--- a/chrome/browser/chromeos/login/user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/user_manager_impl.cc

@@ -6,9 +6,9 @@

#include <vector>

-#include "ash/shell.h"

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/desktop_background/desktop_background_resources.h"

+#include "ash/shell.h"

#include "base/bind.h"

#include "base/chromeos/chromeos_version.h"

#include "base/command_line.h"

@@ -31,8 +31,6 @@

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros_settings.h"

#include "chrome/browser/chromeos/cryptohome/async_method_caller.h"

-#include "chrome/browser/chromeos/dbus/cryptohome_client.h"

-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

#include "chrome/browser/chromeos/input_method/input_method_manager.h"

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

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

@@ -51,6 +49,8 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/net/gaia/google_service_auth_error.h"

+#include "chromeos/dbus/cryptohome_client.h"

+#include "chromeos/dbus/dbus_thread_manager.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

#include "content/public/common/url_constants.h"