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

Unified Diff: views/controls/native_control_win.cc

Issue 6254011: Move UI-relevant Windows files to 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/native_control.cc ('k') | views/controls/scrollbar/native_scroll_bar_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/native_control_win.cc
===================================================================
--- views/controls/native_control_win.cc (revision 71828)
+++ views/controls/native_control_win.cc (working copy)
@@ -7,9 +7,9 @@
#include <windowsx.h>
#include "app/l10n_util_win.h"
-#include "app/win/hwnd_util.h"
#include "app/view_prop.h"
#include "base/logging.h"
+#include "ui/base/win/hwnd_util.h"
#include "views/focus/focus_manager.h"
using app::ViewProp;
@@ -136,7 +136,7 @@
props_.push_back(ChildWindowMessageProcessor::Register(native_control, this));
// Subclass so we get WM_KEYDOWN and WM_SETFOCUS messages.
- original_wndproc_ = app::win::SetWindowProc(
+ original_wndproc_ = ui::SetWindowProc(
native_control, &NativeControlWin::NativeControlWndProc);
Attach(native_control);
@@ -213,7 +213,7 @@
}
} else if (message == WM_DESTROY) {
native_control->props_.reset();
- app::win::SetWindowProc(window, native_control->original_wndproc_);
+ ui::SetWindowProc(window, native_control->original_wndproc_);
}
return CallWindowProc(native_control->original_wndproc_, window, message,
« no previous file with comments | « views/controls/native_control.cc ('k') | views/controls/scrollbar/native_scroll_bar_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698