chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 12189011: Split up chrome/browser/policy subdirectory

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/system/ash_system_tray_delegate.cc

Issue 12189011: Split up chrome/browser/policy subdirectory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase, add chrome/browser/chromeos/policy/OWNERS Created 7 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/system/ash_system_tray_delegate.cc

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

index caba910ee4cc548a5ee8f4f8c5743156c2bb7630..a251ca2b5df59a5ef6ed4c80876095cdad73c532 100644

--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -56,6 +56,7 @@

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

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

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

+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"

#include "chrome/browser/chromeos/status/data_promo_notification.h"

#include "chrome/browser/chromeos/status/network_menu.h"

#include "chrome/browser/chromeos/status/network_menu_icon.h"

@@ -65,8 +66,7 @@

#include "chrome/browser/google_apis/drive_service_interface.h"

#include "chrome/browser/lifetime/application_lifetime.h"

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

-#include "chrome/browser/policy/cloud_policy_store.h"

-#include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"

+#include "chrome/browser/policy/cloud/cloud_policy_store.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/ash/volume_controller_chromeos.h"

#include "chrome/browser/ui/browser.h"