diff options
author | thestig <thestig@chromium.org> | 2015-08-28 19:45:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-29 02:46:17 +0000 |
commit | 5a551c4cbd70762d490e81c15c40fc79f19e5845 (patch) | |
tree | 382d0acd72d05353efd6f9e6424b84dbc337288a /content/browser/browser_main_runner.cc | |
parent | 887e4064707448954399162978e0a951ee4bdf1e (diff) | |
download | chromium_src-5a551c4cbd70762d490e81c15c40fc79f19e5845.zip chromium_src-5a551c4cbd70762d490e81c15c40fc79f19e5845.tar.gz chromium_src-5a551c4cbd70762d490e81c15c40fc79f19e5845.tar.bz2 |
Fix some extern usage in .cc files.
Review URL: https://codereview.chromium.org/1313533003
Cr-Commit-Position: refs/heads/master@{#346304}
Diffstat (limited to 'content/browser/browser_main_runner.cc')
-rw-r--r-- | content/browser/browser_main_runner.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index d7575f6..9f8e5ef 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -32,13 +32,13 @@ #include "ui/gfx/win/direct_write.h" #endif -bool g_exited_main_message_loop = false; - namespace content { -#if defined(OS_WIN) namespace { +bool g_exited_main_message_loop = false; + +#if defined(OS_WIN) #if !defined(_WIN64) // Pointer to the original CryptVerifyCertificateSignatureEx function. net::sha256_interception::CryptVerifyCertificateSignatureExFunc @@ -116,11 +116,10 @@ void InstallSha256LegacyHooks() { &old_protect)); #endif // _WIN64 } +#endif // OS_WIN } // namespace -#endif // OS_WIN - class BrowserMainRunnerImpl : public BrowserMainRunner { public: BrowserMainRunnerImpl() @@ -289,6 +288,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { scoped_ptr<ui::ScopedOleInitializer> ole_initializer_; #endif + private: DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl); }; @@ -297,4 +297,9 @@ BrowserMainRunner* BrowserMainRunner::Create() { return new BrowserMainRunnerImpl(); } +// static +bool BrowserMainRunner::ExitedMainMessageLoop() { + return g_exited_main_message_loop; +} + } // namespace content |