chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 10919051: Move device notification impl out of chrome/browser/media_gallery

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 10919051: Move device notification impl out of chrome/browser/media_gallery (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: modify for chromeos and win Created 8 years, 3 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 8fcf8ee3c3d82148e8c283f16238c25050a2f60f..1fdaeda8852b8e40ddcd933cf6f60b6ca31204d3 100644

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

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

@@ -59,7 +59,6 @@

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

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

#include "chrome/browser/defaults.h"

-#include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"

#include "chrome/browser/metrics/metrics_service.h"

#include "chrome/browser/net/chrome_network_delegate.h"

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

@@ -68,6 +67,7 @@

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

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

#include "chrome/browser/signin/token_service_factory.h"

+#include "chrome/browser/system_monitor/media_device_notifications_chromeos.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/intents/device_attached_intent_source.cc » ('j') | no next file with comments »