chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

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 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 5 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

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 ff6ae4d5bd96462005cab8dc6a07734bc21869ef..e57a174593821d12e72368cf35bd2e7afe446cd9 100644

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

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

@@ -32,9 +32,7 @@

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

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

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

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

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

-#include "chrome/browser/chromeos/login/session_manager_observer.h"

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

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

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

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

#include "chrome/browser/chromeos/power/screen_lock_observer.h"

#include "chrome/browser/chromeos/power/user_activity_notifier.h"

#include "chrome/browser/chromeos/power/video_activity_notifier.h"

+#include "chrome/browser/chromeos/settings/ownership_service.h"

+#include "chrome/browser/chromeos/settings/session_manager_observer.h"

#include "chrome/browser/chromeos/system/statistics_provider.h"

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

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

« no previous file with comments | « chrome/browser/chrome_browser_main_linux.cc ('k') | chrome/browser/chromeos/cros/network_library_impl_cros.cc » ('j') | no next file with comments »