Update to Chromium revision 115322.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@435 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-12-21 18:35:55 +00:00
parent ec797bafe5
commit bdb588b77a
29 changed files with 119 additions and 75 deletions

View File

@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "cef_thread.h"
#include "media/audio/audio_manager.h"
#include "net/base/network_change_notifier.h"
class BrowserWebKitInit;
@ -37,6 +38,8 @@ class CefProcessUIThread
virtual void Init();
virtual void CleanUp();
AudioManager* audio_manager();
private:
void PlatformInit();
void PlatformCleanUp();
@ -50,6 +53,7 @@ class CefProcessUIThread
BrowserWebKitInit* webkit_init_;
scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
scoped_refptr<AudioManager> audio_manager_;
DISALLOW_COPY_AND_ASSIGN(CefProcessUIThread);
};