chrome/browser/policy/device_policy_cache.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/policy/device_policy_cache.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: Rebase Created 8 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:

Index: chrome/browser/policy/device_policy_cache.cc

diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc

index 2a16db9f474a6fcb2dfb0d0edc809b2b6f9333c1..c7befed40f8ece9af1706e1127b5bedba1e35166 100644

--- a/chrome/browser/policy/device_policy_cache.cc

+++ b/chrome/browser/policy/device_policy_cache.cc

@@ -16,8 +16,6 @@

#include "base/metrics/histogram.h"

#include "base/values.h"

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

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

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

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

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

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

@@ -28,6 +26,8 @@

#include "chrome/browser/policy/policy_map.h"

#include "chrome/browser/policy/proto/device_management_backend.pb.h"

#include "chrome/browser/policy/proto/device_management_local.pb.h"

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

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

#include "policy/policy_constants.h"

using google::protobuf::RepeatedPtrField;