content/browser/browser_main_loop.cc - Issue 9555014: Revert 124288 (made mac browser and ui_tests flaky) - Add Media device notification to SystemMonito…

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: content/browser/browser_main_loop.cc

Issue 9555014: Revert 124288 (made mac browser and ui_tests flaky) - Add Media device notification to SystemMonito… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 10 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: content/browser/browser_main_loop.cc

===================================================================

--- content/browser/browser_main_loop.cc (revision 124333)

+++ content/browser/browser_main_loop.cc (working copy)

@@ -53,10 +53,6 @@

#include "net/base/winsock_init.h"

#endif

-#if defined(OS_MACOSX)

-#include "content/browser/mac/media_device_notifications.h"

-#endif

#if defined(OS_LINUX) || defined(OS_OPENBSD)

#include <glib-object.h>

#endif

@@ -331,8 +327,6 @@

#if defined(OS_WIN)

system_message_window_.reset(new SystemMessageWindowWin);

-#elif defined(OS_MACOSX)

- StartMediaDeviceNotifications();

#endif

// Prior to any processing happening on the io thread, we create the

« no previous file with comments | « base/test/mock_devices_changed_observer.cc ('k') | content/browser/mac/media_device_notifications.h » ('j') | no next file with comments »