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

Side by Side Diff: base/win/message_window.cc

Issue 15261005: Allow multiple base::MessagePumpForUI instances to be created simultanenously on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback Created 7 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "remoting/host/win/message_window.h" 5 #include "base/win/message_window.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/process_util.h" 8 #include "base/process_util.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/win/wrapped_window_proc.h" 11 #include "base/win/wrapped_window_proc.h"
12 12
13 const char kClassNameFormat[] = "Chromoting_MessageWindow_%p"; 13 const char kClassNameFormat[] = "Chrome_MessageWindow_%p";
14 14
15 namespace remoting { 15 namespace base {
16 namespace win { 16 namespace win {
17 17
18 MessageWindow::MessageWindow() 18 MessageWindow::MessageWindow()
19 : atom_(0), 19 : atom_(0),
20 instance_(NULL), 20 instance_(NULL),
21 window_(NULL) { 21 window_(NULL) {
22 class_name_ = base::StringPrintf(kClassNameFormat, this); 22 class_name_ = base::StringPrintf(kClassNameFormat, this);
23 instance_ = base::GetModuleFromAddress(static_cast<WNDPROC>( 23 instance_ = base::GetModuleFromAddress(static_cast<WNDPROC>(
24 &base::win::WrappedWindowProc<WindowProc>)); 24 &base::win::WrappedWindowProc<WindowProc>));
25 } 25 }
26 26
27 MessageWindow::MessageWindow(const std::string& class_name, HINSTANCE instance)
28 : atom_(0),
29 class_name_(class_name),
30 instance_(instance),
31 window_(NULL) {
32 }
33
34 MessageWindow::~MessageWindow() { 27 MessageWindow::~MessageWindow() {
35 DCHECK(CalledOnValidThread()); 28 DCHECK(CalledOnValidThread());
36 29
37 if (window_ != NULL) { 30 if (window_ != NULL) {
38 DestroyWindow(window_); 31 DestroyWindow(window_);
39 window_ = NULL; 32 window_ = NULL;
40 } 33 }
41 34
42 if (atom_ != 0) { 35 if (atom_ != 0) {
43 UnregisterClass(MAKEINTATOM(atom_), instance_); 36 UnregisterClass(MAKEINTATOM(atom_), instance_);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 if (delegate) { 101 if (delegate) {
109 LRESULT message_result; 102 LRESULT message_result;
110 if (delegate->HandleMessage(hwnd, message, wparam, lparam, &message_result)) 103 if (delegate->HandleMessage(hwnd, message, wparam, lparam, &message_result))
111 return message_result; 104 return message_result;
112 } 105 }
113 106
114 return DefWindowProc(hwnd, message, wparam, lparam); 107 return DefWindowProc(hwnd, message, wparam, lparam);
115 } 108 }
116 109
117 } // namespace win 110 } // namespace win
118 } // namespace remoting 111 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698