| OLD | NEW |
| 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/aura/remote_root_window_host_win.h" | 5 #include "ui/aura/remote_root_window_host_win.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 g_instance = g_instance ? g_instance : new RemoteRootWindowHostWin(bounds); | 129 g_instance = g_instance ? g_instance : new RemoteRootWindowHostWin(bounds); |
| 130 return g_instance; | 130 return g_instance; |
| 131 } | 131 } |
| 132 | 132 |
| 133 RemoteRootWindowHostWin::RemoteRootWindowHostWin(const gfx::Rect& bounds) | 133 RemoteRootWindowHostWin::RemoteRootWindowHostWin(const gfx::Rect& bounds) |
| 134 : remote_window_(NULL), | 134 : remote_window_(NULL), |
| 135 host_(NULL), | 135 host_(NULL), |
| 136 ignore_mouse_moves_until_set_cursor_ack_(false), | 136 ignore_mouse_moves_until_set_cursor_ack_(false), |
| 137 event_flags_(0) { | 137 event_flags_(0) { |
| 138 prop_.reset(new ui::ViewProp(NULL, kRootWindowHostWinKey, this)); | 138 prop_.reset(new ui::ViewProp(NULL, kRootWindowHostWinKey, this)); |
| 139 CreateCompositor(GetAcceleratedWidget()); | |
| 140 } | 139 } |
| 141 | 140 |
| 142 RemoteRootWindowHostWin::~RemoteRootWindowHostWin() { | 141 RemoteRootWindowHostWin::~RemoteRootWindowHostWin() { |
| 143 g_instance = NULL; | 142 g_instance = NULL; |
| 144 } | 143 } |
| 145 | 144 |
| 146 void RemoteRootWindowHostWin::Connected(IPC::Sender* host, HWND remote_window) { | 145 void RemoteRootWindowHostWin::Connected(IPC::Sender* host, HWND remote_window) { |
| 147 CHECK(host_ == NULL); | 146 CHECK(host_ == NULL); |
| 148 host_ = host; | 147 host_ = host; |
| 149 remote_window_ = remote_window; | 148 remote_window_ = remote_window; |
| 149 CreateCompositor(remote_window_); |
| 150 } | 150 } |
| 151 | 151 |
| 152 void RemoteRootWindowHostWin::Disconnected() { | 152 void RemoteRootWindowHostWin::Disconnected() { |
| 153 // Don't CHECK here, Disconnected is called on a channel error which can | 153 // Don't CHECK here, Disconnected is called on a channel error which can |
| 154 // happen before we're successfully Connected. | 154 // happen before we're successfully Connected. |
| 155 host_ = NULL; | 155 host_ = NULL; |
| 156 remote_window_ = NULL; | 156 remote_window_ = NULL; |
| 157 } | 157 } |
| 158 | 158 |
| 159 bool RemoteRootWindowHostWin::OnMessageReceived(const IPC::Message& message) { | 159 bool RemoteRootWindowHostWin::OnMessageReceived(const IPC::Message& message) { |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 } | 606 } |
| 607 | 607 |
| 608 void RemoteRootWindowHostWin::SetEventFlags(uint32 flags) { | 608 void RemoteRootWindowHostWin::SetEventFlags(uint32 flags) { |
| 609 if (flags == event_flags_) | 609 if (flags == event_flags_) |
| 610 return; | 610 return; |
| 611 event_flags_ = flags; | 611 event_flags_ = flags; |
| 612 SetVirtualKeyStates(event_flags_); | 612 SetVirtualKeyStates(event_flags_); |
| 613 } | 613 } |
| 614 | 614 |
| 615 } // namespace aura | 615 } // namespace aura |
| OLD | NEW |