chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 153153002: [chromeos] Move files from chromeos/power to chrome/browser/chromeos/power

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 153153002: [chromeos] Move files from chromeos/power to chrome/browser/chromeos/power (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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 c1744ff91e97dd4659443b0b874f8dd733b65ee6..2e11fd51701001e19d15ce38bb9a067e5e00d152 100644

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

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

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

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

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

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

+#include "chrome/browser/chromeos/power/power_data_collector.h"

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

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"

@@ -94,7 +95,6 @@

#include "chromeos/network/network_change_notifier_chromeos.h"

#include "chromeos/network/network_change_notifier_factory_chromeos.h"

#include "chromeos/network/network_handler.h"

-#include "chromeos/power/power_data_collector.h"

#include "chromeos/system/statistics_provider.h"

#include "chromeos/tpm_token_loader.h"

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

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