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

Unified Diff: ash/host/ash_window_tree_host.cc

Issue 1745723002: Fix ChromeOS-only static initializers from the last 5 months. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, address dhsharp comment Created 4 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/download_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host.cc
diff --git a/ash/host/ash_window_tree_host.cc b/ash/host/ash_window_tree_host.cc
index 0bc59558f36effcf81d2c04348067faf9a6147e0..2c819c01bb3b707992de1d2e17c60fa9d23d7bd3 100644
--- a/ash/host/ash_window_tree_host.cc
+++ b/ash/host/ash_window_tree_host.cc
@@ -6,6 +6,7 @@
#include "ash/host/ash_window_tree_host_init_params.h"
#include "ash/host/ash_window_tree_host_unified.h"
+#include "base/lazy_instance.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/window_tree_host.h"
#include "ui/events/event.h"
@@ -23,7 +24,8 @@ namespace ash {
namespace {
-AshWindowTreeHost::Factory creation_factory;
+base::LazyInstance<AshWindowTreeHost::Factory> creation_factory =
+ LAZY_INSTANCE_INITIALIZER;
} // namespace
@@ -58,8 +60,8 @@ void AshWindowTreeHost::TranslateLocatedEvent(ui::LocatedEvent* event) {
// static
AshWindowTreeHost* AshWindowTreeHost::Create(
const AshWindowTreeHostInitParams& init_params) {
- if (!creation_factory.is_null())
- return creation_factory.Run(init_params);
+ if (!creation_factory.Get().is_null())
+ return creation_factory.Get().Run(init_params);
if (init_params.offscreen)
return new AshWindowTreeHostUnified(init_params.initial_bounds);
@@ -76,7 +78,7 @@ AshWindowTreeHost* AshWindowTreeHost::Create(
// static
void AshWindowTreeHost::SetFactory(const Factory& factory) {
- creation_factory = factory;
+ creation_factory.Get() = factory;
}
} // namespace ash
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/download_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698