Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3838)

Unified Diff: chromecast/browser/cast_browser_main_parts.h

Issue 1113053002: Set the AudioManager factory before the browser main loop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add getter for factory. Created 5 years, 8 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: chromecast/browser/cast_browser_main_parts.h
diff --git a/chromecast/browser/cast_browser_main_parts.h b/chromecast/browser/cast_browser_main_parts.h
index 7c9baf49ad79fddd853d9e3d89093edf19d4f489..777343d7f3ed2d8d6816ecdc10b6908794b0eec0 100644
--- a/chromecast/browser/cast_browser_main_parts.h
+++ b/chromecast/browser/cast_browser_main_parts.h
@@ -10,6 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/browser_main_parts.h"
#include "content/public/common/main_function_params.h"
+#include "media/audio/audio_manager_factory.h"
derekjchow1 2015/04/30 17:33:15 Don't include. Forward declare ::media::AudioManag
slan 2015/04/30 17:52:04 Done.
namespace chromecast {
namespace shell {
@@ -18,9 +19,12 @@ class URLRequestContextFactory;
class CastBrowserMainParts : public content::BrowserMainParts {
public:
+ // This class does not take ownership of |url_request_content_factory|.
+ // AudioManagerFactory is a platform factory used to create AudioManagers.
gunsch 2015/04/30 17:29:36 second line unnecessary, that can be gleaned from
slan 2015/04/30 17:52:04 Done.
CastBrowserMainParts(
const content::MainFunctionParams& parameters,
- URLRequestContextFactory* url_request_context_factory);
+ URLRequestContextFactory* url_request_context_factory,
+ scoped_ptr<::media::AudioManagerFactory> audio_manager_factory);
~CastBrowserMainParts() override;
// content::BrowserMainParts implementation:
@@ -35,6 +39,7 @@ class CastBrowserMainParts : public content::BrowserMainParts {
scoped_ptr<CastBrowserProcess> cast_browser_process_;
const content::MainFunctionParams parameters_; // For running browser tests.
URLRequestContextFactory* const url_request_context_factory_;
+ scoped_ptr<::media::AudioManagerFactory> audio_manager_factory_;
DISALLOW_COPY_AND_ASSIGN(CastBrowserMainParts);
};

Powered by Google App Engine
This is Rietveld 408576698