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

Side by Side Diff: views/controls/native_control_win.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « views/controls/native_control.cc ('k') | views/controls/table/native_table_gtk.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/controls/native_control_win.h" 5 #include "views/controls/native_control_win.h"
6 6
7 #include <windowsx.h> 7 #include <windowsx.h>
8 8
9 #include "app/l10n_util_win.h" 9 #include "app/l10n_util_win.h"
10 #include "app/view_prop.h"
11 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "ui/base/view_prop.h"
12 #include "ui/base/win/hwnd_util.h" 12 #include "ui/base/win/hwnd_util.h"
13 #include "views/focus/focus_manager.h" 13 #include "views/focus/focus_manager.h"
14 14
15 using app::ViewProp; 15 using ui::ViewProp;
16 16
17 namespace views { 17 namespace views {
18 18
19 static const char* const kNativeControlWinKey = "__NATIVE_CONTROL_WIN__"; 19 static const char* const kNativeControlWinKey = "__NATIVE_CONTROL_WIN__";
20 20
21 //////////////////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////////////////
22 // NativeControlWin, public: 22 // NativeControlWin, public:
23 23
24 NativeControlWin::NativeControlWin() { 24 NativeControlWin::NativeControlWin() {
25 } 25 }
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 } else if (message == WM_DESTROY) { 214 } else if (message == WM_DESTROY) {
215 native_control->props_.reset(); 215 native_control->props_.reset();
216 ui::SetWindowProc(window, native_control->original_wndproc_); 216 ui::SetWindowProc(window, native_control->original_wndproc_);
217 } 217 }
218 218
219 return CallWindowProc(native_control->original_wndproc_, window, message, 219 return CallWindowProc(native_control->original_wndproc_, window, message,
220 w_param, l_param); 220 w_param, l_param);
221 } 221 }
222 222
223 } // namespace views 223 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/native_control.cc ('k') | views/controls/table/native_table_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698