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

Unified Diff: views/controls/native_control.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/menu/native_menu_win.cc ('k') | views/controls/native_control_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/native_control.cc
===================================================================
--- views/controls/native_control.cc (revision 71828)
+++ views/controls/native_control.cc (working copy)
@@ -11,13 +11,13 @@
#include <atlmisc.h>
#include "app/l10n_util_win.h"
-#include "app/win/hwnd_util.h"
#include "app/view_prop.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "gfx/native_theme_win.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/win/hwnd_util.h"
#include "views/background.h"
#include "views/border.h"
#include "views/controls/native/native_view_host.h"
@@ -89,7 +89,7 @@
control_ = parent_->CreateNativeControl(m_hWnd);
// We subclass the control hwnd so we get the WM_KEYDOWN messages.
- original_handler_ = app::win::SetWindowProc(
+ original_handler_ = ui::SetWindowProc(
control_, &NativeControl::NativeControlWndProc);
prop_.reset(new ViewProp(control_, kNativeControlKey , parent_));
@@ -382,8 +382,7 @@
NOTREACHED();
}
} else if (message == WM_DESTROY) {
- app::win::SetWindowProc(window,
- reinterpret_cast<WNDPROC>(original_handler));
+ ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler));
native_control->container_->prop_.reset();
}
« no previous file with comments | « views/controls/menu/native_menu_win.cc ('k') | views/controls/native_control_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698