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

Side by Side Diff: ui/gfx/win/singleton_hwnd.cc

Issue 23769011: Move a bunch of windows stuff from ui/base/win to ui/gfx/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar bustage. Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/win/singleton_hwnd.h ('k') | ui/gfx/win/window_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/win/singleton_hwnd.h" 5 #include "ui/gfx/win/singleton_hwnd.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 9
10 namespace ui { 10 namespace gfx {
11 11
12 // static 12 // static
13 SingletonHwnd* SingletonHwnd::GetInstance() { 13 SingletonHwnd* SingletonHwnd::GetInstance() {
14 return Singleton<SingletonHwnd>::get(); 14 return Singleton<SingletonHwnd>::get();
15 } 15 }
16 16
17 void SingletonHwnd::AddObserver(Observer* observer) { 17 void SingletonHwnd::AddObserver(Observer* observer) {
18 if (!hwnd()) { 18 if (!hwnd()) {
19 if (!base::MessageLoop::current() || 19 if (!base::MessageLoop::current() ||
20 base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) { 20 base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) {
21 // Creating this window in (e.g.) a renderer inhibits shutdown on 21 // Creating this window in (e.g.) a renderer inhibits shutdown on
22 // Windows. See http://crbug.com/230122 and http://crbug.com/236039. 22 // Windows. See http://crbug.com/230122 and http://crbug.com/236039.
23 DLOG(ERROR) << "Cannot create windows on non-UI thread!"; 23 DLOG(ERROR) << "Cannot create windows on non-UI thread!";
24 return; 24 return;
25 } 25 }
26 WindowImpl::Init(NULL, gfx::Rect()); 26 WindowImpl::Init(NULL, Rect());
27 } 27 }
28 observer_list_.AddObserver(observer); 28 observer_list_.AddObserver(observer);
29 } 29 }
30 30
31 void SingletonHwnd::RemoveObserver(Observer* observer) { 31 void SingletonHwnd::RemoveObserver(Observer* observer) {
32 if (!hwnd()) 32 if (!hwnd())
33 return; 33 return;
34 observer_list_.RemoveObserver(observer); 34 observer_list_.RemoveObserver(observer);
35 } 35 }
36 36
37 BOOL SingletonHwnd::ProcessWindowMessage(HWND window, 37 BOOL SingletonHwnd::ProcessWindowMessage(HWND window,
38 UINT message, 38 UINT message,
39 WPARAM wparam, 39 WPARAM wparam,
40 LPARAM lparam, 40 LPARAM lparam,
41 LRESULT& result, 41 LRESULT& result,
42 DWORD msg_map_id) { 42 DWORD msg_map_id) {
43 FOR_EACH_OBSERVER(Observer, 43 FOR_EACH_OBSERVER(Observer,
44 observer_list_, 44 observer_list_,
45 OnWndProc(window, message, wparam, lparam)); 45 OnWndProc(window, message, wparam, lparam));
46 return false; 46 return false;
47 } 47 }
48 48
49 SingletonHwnd::SingletonHwnd() { 49 SingletonHwnd::SingletonHwnd() {
50 } 50 }
51 51
52 SingletonHwnd::~SingletonHwnd() { 52 SingletonHwnd::~SingletonHwnd() {
53 } 53 }
54 54
55 } // namespace ui 55 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/win/singleton_hwnd.h ('k') | ui/gfx/win/window_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698