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

Side by Side Diff: views/widget/native_widget_win.cc

Issue 6992086: Fixes bug in NativeWidgetWin::GetAcceleratedWidget. I had the ifdef (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « no previous file | views/widget/widget.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/widget/native_widget_win.h" 5 #include "views/widget/native_widget_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/system_monitor/system_monitor.h" 10 #include "base/system_monitor/system_monitor.h"
(...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 std::max(0, static_cast<int>(r.bottom - r.top))); 1140 std::max(0, static_cast<int>(r.bottom - r.top)));
1141 delegate_->OnSizeChanged(s); 1141 delegate_->OnSizeChanged(s);
1142 if (use_layered_buffer_) { 1142 if (use_layered_buffer_) {
1143 layered_window_contents_.reset( 1143 layered_window_contents_.reset(
1144 new gfx::CanvasSkia(s.width(), s.height(), false)); 1144 new gfx::CanvasSkia(s.width(), s.height(), false));
1145 } 1145 }
1146 } 1146 }
1147 1147
1148 gfx::AcceleratedWidget NativeWidgetWin::GetAcceleratedWidget() { 1148 gfx::AcceleratedWidget NativeWidgetWin::GetAcceleratedWidget() {
1149 #if defined(VIEWS_COMPOSITOR) 1149 #if defined(VIEWS_COMPOSITOR)
1150 return hwnd();
1151 #else
1150 return gfx::kNullAcceleratedWidget; 1152 return gfx::kNullAcceleratedWidget;
1151 #else
1152 return hwnd();
1153 #endif 1153 #endif
1154 } 1154 }
1155 1155
1156 void NativeWidgetWin::DispatchKeyEventPostIME(const KeyEvent& key) { 1156 void NativeWidgetWin::DispatchKeyEventPostIME(const KeyEvent& key) {
1157 SetMsgHandled(delegate_->OnKeyEvent(key)); 1157 SetMsgHandled(delegate_->OnKeyEvent(key));
1158 } 1158 }
1159 1159
1160 //////////////////////////////////////////////////////////////////////////////// 1160 ////////////////////////////////////////////////////////////////////////////////
1161 // Widget, public: 1161 // Widget, public:
1162 1162
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1296 1296
1297 // And now, notify them that they have a brand new parent. 1297 // And now, notify them that they have a brand new parent.
1298 for (NativeWidgets::iterator it = widgets.begin(); 1298 for (NativeWidgets::iterator it = widgets.begin();
1299 it != widgets.end(); ++it) { 1299 it != widgets.end(); ++it) {
1300 (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true, 1300 (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
1301 new_parent); 1301 new_parent);
1302 } 1302 }
1303 } 1303 }
1304 1304
1305 } // namespace views 1305 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698