diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 23:13:06 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 23:13:06 +0000 |
| commit | 01fa11e0542c0c56cd4c735fce6018a4fb6add32 (patch) | |
| tree | 8324bfbd3e1900f0324b94cc70c3a1f56b035b34 /content/browser | |
| parent | 2a0b24ff9daf4316438504a3e594d976b96e39c9 (diff) | |
| download | chromium_src-01fa11e0542c0c56cd4c735fce6018a4fb6add32.zip chromium_src-01fa11e0542c0c56cd4c735fce6018a4fb6add32.tar.gz chromium_src-01fa11e0542c0c56cd4c735fce6018a4fb6add32.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101861 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, 3 insertions, 6 deletions
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc index b2ba07d..e95aa7e 100644 --- a/content/browser/browser_main.cc +++ b/content/browser/browser_main.cc @@ -167,6 +167,9 @@ 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 141fe1f..f45c72b 100644 --- a/content/browser/browser_main.h +++ b/content/browser/browser_main.h @@ -125,12 +125,6 @@ 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_ |