chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 10878061: chromeos: Move src/chrome/browser/chromeos/cryptohome to src/chromeos

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/chrome_browser_main_chromeos.cc

Issue 10878061: chromeos: Move src/chrome/browser/chromeos/cryptohome to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 4 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/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 0b52b59035803cf8a73f301ea8516383a7ba88eb..8c64b6763633b6d52932edce95c1597c79c0cc17 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -19,7 +19,6 @@

#include "chrome/browser/chromeos/audio/audio_handler.h"

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

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

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

#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"

#include "chrome/browser/chromeos/disks/disk_mount_manager.h"

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

@@ -72,6 +71,7 @@

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/logging_chrome.h"

#include "chrome/common/pref_names.h"

+#include "chromeos/cryptohome/async_method_caller.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

« no previous file with comments | « no previous file | chrome/browser/chromeos/cryptohome/async_method_caller.h » ('j') | no next file with comments »