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

Unified Diff: content/browser/browser_main_runner.cc

Issue 1313533003: Fix some extern usage in .cc files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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: content/browser/browser_main_runner.cc
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index d7575f67b703ce95816c5c78a477d28744192a6c..9f8e5efdc88d8d59271090e24b9457779b88684f 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

Powered by Google App Engine
This is Rietveld 408576698