summaryrefslogtreecommitdiffstats
path: root/ui/gfx/win/singleton_hwnd.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gfx/win/singleton_hwnd.cc')
-rw-r--r--ui/gfx/win/singleton_hwnd.cc18
1 files changed, 8 insertions, 10 deletions
diff --git a/ui/gfx/win/singleton_hwnd.cc b/ui/gfx/win/singleton_hwnd.cc
index 37993e8..2de6a8b 100644
--- a/ui/gfx/win/singleton_hwnd.cc
+++ b/ui/gfx/win/singleton_hwnd.cc
@@ -15,16 +15,6 @@ SingletonHwnd* SingletonHwnd::GetInstance() {
}
void SingletonHwnd::AddObserver(Observer* observer) {
- if (!hwnd()) {
- if (!base::MessageLoop::current() ||
- base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) {
- // Creating this window in (e.g.) a renderer inhibits shutdown on
- // Windows. See http://crbug.com/230122 and http://crbug.com/236039.
- DLOG(ERROR) << "Cannot create windows on non-UI thread!";
- return;
- }
- WindowImpl::Init(NULL, Rect());
- }
observer_list_.AddObserver(observer);
}
@@ -47,6 +37,14 @@ BOOL SingletonHwnd::ProcessWindowMessage(HWND window,
}
SingletonHwnd::SingletonHwnd() {
+ if (!base::MessageLoop::current() ||
+ base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) {
+ // Creating this window in (e.g.) a renderer inhibits shutdown on
+ // Windows. See http://crbug.com/230122 and http://crbug.com/236039.
+ DLOG(ERROR) << "Cannot create windows on non-UI thread!";
+ return;
+ }
+ WindowImpl::Init(NULL, Rect());
}
SingletonHwnd::~SingletonHwnd() {