diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 00:35:15 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 00:35:15 +0000 |
| commit | db021357a069782b9fa5c4be509c88e26acdd727 (patch) | |
| tree | 0818dfde86cc54bd87160232481f1ab3d09c44b4 /content/browser | |
| parent | 1be5c37936e372a276aa8e36f22c7e37d0edccc4 (diff) | |
| download | chromium_src-db021357a069782b9fa5c4be509c88e26acdd727.zip chromium_src-db021357a069782b9fa5c4be509c88e26acdd727.tar.gz chromium_src-db021357a069782b9fa5c4be509c88e26acdd727.tar.bz2 | |
Revert 101861 - Get rid of content::DidEndMainMessageLoop since it was declared in content but defined in chrome, and called by chrome.
Review URL: http://codereview.chromium.org/7948006
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/7967008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/browser_main.cc | 3 | ||||
| -rw-r--r-- | content/browser/browser_main.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc index e95aa7e..b2ba07d 100644 --- a/content/browser/browser_main.cc +++ b/content/browser/browser_main.cc @@ -167,9 +167,6 @@ BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters) } BrowserMainParts::~BrowserMainParts() { -#if defined(OS_WIN) - OleUninitialize(); -#endif } void BrowserMainParts::EarlyInitialization() { diff --git a/content/browser/browser_main.h b/content/browser/browser_main.h index f45c72b..141fe1f 100644 --- a/content/browser/browser_main.h +++ b/content/browser/browser_main.h @@ -125,6 +125,12 @@ class CONTENT_EXPORT BrowserMainParts { DISALLOW_COPY_AND_ASSIGN(BrowserMainParts); }; +// Perform platform-specific work that needs to be done after the main event +// loop has ended. The embedder must be sure to call this. +// TODO(jam): change this so that content calls it so that we don't depend on +// the embedder. +void DidEndMainMessageLoop(); + } // namespace content #endif // CONTENT_BROWSER_BROWSER_MAIN_H_ |