summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/controls/menu/menu_win.cc4
-rw-r--r--views/controls/menu/native_menu_win.cc6
-rw-r--r--views/controls/native_control.cc6
-rw-r--r--views/controls/native_control_win.cc9
-rw-r--r--views/controls/scrollbar/native_scroll_bar_win.cc4
-rw-r--r--views/controls/table/native_table_win.cc6
-rw-r--r--views/controls/table/table_view.cc6
-rw-r--r--views/controls/tree/tree_view.cc4
-rw-r--r--views/focus/focus_util_win.cc5
-rw-r--r--views/widget/widget_win.cc6
-rw-r--r--views/widget/widget_win.h4
-rw-r--r--views/window/window_win.cc4
12 files changed, 32 insertions, 32 deletions
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index 0c75743..294ea7e 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -9,13 +9,13 @@
#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
+#include "app/win/window_impl.h"
#include "base/logging.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
#include "gfx/canvas_skia.h"
#include "gfx/font.h"
#include "gfx/rect.h"
-#include "gfx/window_impl.h"
#include "views/accelerator.h"
namespace views {
@@ -62,7 +62,7 @@ static int ChromeGetMenuItemID(HMENU hMenu, int pos) {
// to intercept right clicks on the HMENU and notify the delegate as well as
// for drawing icons.
//
-class MenuHostWindow : public gfx::WindowImpl {
+class MenuHostWindow : public app::win::WindowImpl {
public:
MenuHostWindow(MenuWin* menu, HWND parent_window) : menu_(menu) {
int extended_style = 0;
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index 3c31639..cf36c8e 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -7,9 +7,9 @@
#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
+#include "app/win/hwnd_util.h"
#include "base/logging.h"
#include "base/stl_util-inl.h"
-#include "base/win_util.h"
#include "gfx/canvas_skia.h"
#include "gfx/font.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -56,7 +56,7 @@ class NativeMenuWin::MenuHostWindow {
RegisterClass();
hwnd_ = CreateWindowEx(l10n_util::GetExtendedStyles(), kWindowClassName,
L"", 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
- win_util::SetWindowUserData(hwnd_, this);
+ app::win::SetWindowUserData(hwnd_, this);
}
~MenuHostWindow() {
@@ -275,7 +275,7 @@ class NativeMenuWin::MenuHostWindow {
WPARAM w_param,
LPARAM l_param) {
MenuHostWindow* host =
- reinterpret_cast<MenuHostWindow*>(win_util::GetWindowUserData(window));
+ reinterpret_cast<MenuHostWindow*>(app::win::GetWindowUserData(window));
// host is null during initial construction.
LRESULT l_result = 0;
if (!host || !host->ProcessWindowMessage(window, message, w_param, l_param,
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 13881bb..9434a50 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -13,10 +13,10 @@
#include "app/keyboard_code_conversion_win.h"
#include "app/keyboard_codes.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 "base/win_util.h"
#include "gfx/native_theme_win.h"
#include "views/background.h"
#include "views/border.h"
@@ -89,7 +89,7 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer,
control_ = parent_->CreateNativeControl(m_hWnd);
// We subclass the control hwnd so we get the WM_KEYDOWN messages.
- original_handler_ = win_util::SetWindowProc(
+ original_handler_ = app::win::SetWindowProc(
control_, &NativeControl::NativeControlWndProc);
prop_.reset(new ViewProp(control_, kNativeControlKey , parent_));
@@ -382,7 +382,7 @@ LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window,
NOTREACHED();
}
} else if (message == WM_DESTROY) {
- win_util::SetWindowProc(window,
+ app::win::SetWindowProc(window,
reinterpret_cast<WNDPROC>(original_handler));
native_control->container_->prop_.reset();
}
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index a223993..0c24fef 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -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 "base/win_util.h"
#include "views/focus/focus_manager.h"
using app::ViewProp;
@@ -136,9 +136,8 @@ void NativeControlWin::NativeControlCreated(HWND native_control) {
props_.push_back(ChildWindowMessageProcessor::Register(native_control, this));
// Subclass so we get WM_KEYDOWN and WM_SETFOCUS messages.
- original_wndproc_ =
- win_util::SetWindowProc(native_control,
- &NativeControlWin::NativeControlWndProc);
+ original_wndproc_ = app::win::SetWindowProc(
+ native_control, &NativeControlWin::NativeControlWndProc);
Attach(native_control);
// native_view() is now valid.
@@ -214,7 +213,7 @@ LRESULT NativeControlWin::NativeControlWndProc(HWND window,
}
} else if (message == WM_DESTROY) {
native_control->props_.reset();
- win_util::SetWindowProc(window, native_control->original_wndproc_);
+ app::win::SetWindowProc(window, native_control->original_wndproc_);
}
return CallWindowProc(native_control->original_wndproc_, window, message,
diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc
index 55592a8a..0aea447c 100644
--- a/views/controls/scrollbar/native_scroll_bar_win.cc
+++ b/views/controls/scrollbar/native_scroll_bar_win.cc
@@ -8,8 +8,8 @@
#include <string>
#include "app/keyboard_codes.h"
+#include "app/win/window_impl.h"
#include "base/message_loop.h"
-#include "gfx/window_impl.h"
#include "views/controls/scrollbar/native_scroll_bar.h"
#include "views/controls/scrollbar/scroll_bar.h"
#include "views/widget/widget.h"
@@ -24,7 +24,7 @@ namespace views {
// use instances of this class to wrap native scrollbars.
//
/////////////////////////////////////////////////////////////////////////////
-class ScrollBarContainer : public gfx::WindowImpl {
+class ScrollBarContainer : public app::win::WindowImpl {
public:
explicit ScrollBarContainer(ScrollBar* parent)
: parent_(parent),
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index 82561e1..35769c6 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -10,8 +10,8 @@
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
#include "app/table_model.h"
+#include "app/win/hwnd_util.h"
#include "base/logging.h"
-#include "base/win_util.h"
#include "gfx/canvas_skia.h"
#include "gfx/favicon_size.h"
#include "gfx/icon_util.h"
@@ -408,12 +408,12 @@ void NativeTableWin::CreateNativeControl() {
DCHECK(header);
SetWindowLongPtr(header, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
header_original_handler_ =
- win_util::SetWindowProc(header, &NativeTableWin::TableHeaderWndProc);
+ app::win::SetWindowProc(header, &NativeTableWin::TableHeaderWndProc);
}
SetWindowLongPtr(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
original_handler_ =
- win_util::SetWindowProc(hwnd, &NativeTableWin::TableWndProc);
+ app::win::SetWindowProc(hwnd, &NativeTableWin::TableWndProc);
// Bug 964884: detach the IME attached to this window.
// We should attach IMEs only when we need to input CJK strings.
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 84c0538..d35b074 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -13,9 +13,9 @@
#include "app/l10n_util_win.h"
#include "app/resource_bundle.h"
#include "app/table_model.h"
+#include "app/win/hwnd_util.h"
#include "base/i18n/rtl.h"
#include "base/string_util.h"
-#include "base/win_util.h"
#include "gfx/canvas_skia.h"
#include "gfx/favicon_size.h"
#include "gfx/font.h"
@@ -835,14 +835,14 @@ HWND TableView::CreateNativeControl(HWND parent_container) {
DCHECK(header);
SetWindowLongPtr(header, GWLP_USERDATA,
reinterpret_cast<LONG_PTR>(&table_view_wrapper_));
- header_original_handler_ = win_util::SetWindowProc(header,
+ header_original_handler_ = app::win::SetWindowProc(header,
&TableView::TableHeaderWndProc);
}
SetWindowLongPtr(list_view_, GWLP_USERDATA,
reinterpret_cast<LONG_PTR>(&table_view_wrapper_));
original_handler_ =
- win_util::SetWindowProc(list_view_, &TableView::TableWndProc);
+ app::win::SetWindowProc(list_view_, &TableView::TableWndProc);
// Bug 964884: detach the IME attached to this window.
// We should attach IMEs only when we need to input CJK strings.
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index bfdd454..5fe2ef9 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -10,6 +10,7 @@
#include "app/keyboard_codes.h"
#include "app/l10n_util_win.h"
#include "app/resource_bundle.h"
+#include "app/win/hwnd_util.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/stl_util-inl.h"
@@ -336,8 +337,7 @@ HWND TreeView::CreateNativeControl(HWND parent_container) {
parent_container, NULL, NULL, NULL);
SetWindowLongPtr(tree_view_, GWLP_USERDATA,
reinterpret_cast<LONG_PTR>(&wrapper_));
- original_handler_ = win_util::SetWindowProc(tree_view_,
- &TreeWndProc);
+ original_handler_ = app::win::SetWindowProc(tree_view_, &TreeWndProc);
l10n_util::AdjustUIFontForWindow(tree_view_);
if (model_) {
diff --git a/views/focus/focus_util_win.cc b/views/focus/focus_util_win.cc
index 23172ad..7261075 100644
--- a/views/focus/focus_util_win.cc
+++ b/views/focus/focus_util_win.cc
@@ -6,6 +6,7 @@
#include <windowsx.h>
+#include "app/win/hwnd_util.h"
#include "app/view_prop.h"
#include "base/auto_reset.h"
#include "base/win_util.h"
@@ -34,7 +35,7 @@ static bool WindowSupportsRerouteMouseWheel(HWND window) {
}
static bool IsCompatibleWithMouseWheelRedirection(HWND window) {
- std::wstring class_name = win_util::GetClassName(window);
+ std::wstring class_name = app::win::GetClassName(window);
// Mousewheel redirection to comboboxes is a surprising and
// undesireable user behavior.
return !(class_name == L"ComboBox" ||
@@ -42,7 +43,7 @@ static bool IsCompatibleWithMouseWheelRedirection(HWND window) {
}
static bool CanRedirectMouseWheelFrom(HWND window) {
- std::wstring class_name = win_util::GetClassName(window);
+ std::wstring class_name = app::win::GetClassName(window);
// Older Thinkpad mouse wheel drivers create a window under mouse wheel
// pointer. Detect if we are dealing with this window. In this case we
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index b94efa3..a5ea141 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -8,9 +8,9 @@
#include "app/l10n_util_win.h"
#include "app/system_monitor.h"
#include "app/view_prop.h"
+#include "app/win/hwnd_util.h"
#include "app/win_util.h"
#include "base/string_util.h"
-#include "base/win_util.h"
#include "gfx/canvas_skia.h"
#include "gfx/native_theme_win.h"
#include "gfx/path.h"
@@ -78,7 +78,7 @@ WidgetWin* WidgetWin::GetWidget(HWND hwnd) {
// WindowImpl).
if (!WindowImpl::IsWindowImpl(hwnd))
return NULL;
- return reinterpret_cast<WidgetWin*>(win_util::GetWindowUserData(hwnd));
+ return reinterpret_cast<WidgetWin*>(app::win::GetWindowUserData(hwnd));
}
// static
@@ -1105,7 +1105,7 @@ Window* WidgetWin::GetWindowImpl(HWND hwnd) {
HWND parent = hwnd;
while (parent) {
WidgetWin* widget =
- reinterpret_cast<WidgetWin*>(win_util::GetWindowUserData(parent));
+ reinterpret_cast<WidgetWin*>(app::win::GetWindowUserData(parent));
if (widget && widget->is_window_)
return static_cast<WindowWin*>(widget);
parent = ::GetParent(parent);
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 0c9f1b0..849f5c9 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -14,10 +14,10 @@
#include <string>
#include <vector>
+#include "app/win/window_impl.h"
#include "base/message_loop.h"
#include "base/scoped_vector.h"
#include "base/win/scoped_comptr.h"
-#include "gfx/window_impl.h"
#include "views/focus/focus_manager.h"
#include "views/layout_manager.h"
#include "views/widget/widget.h"
@@ -74,7 +74,7 @@ const int WM_NCUAHDRAWFRAME = 0xAF;
// then responsible for cleaning up after it.
//
///////////////////////////////////////////////////////////////////////////////
-class WidgetWin : public gfx::WindowImpl,
+class WidgetWin : public app::win::WindowImpl,
public Widget,
public MessageLoopForUI::Observer,
public FocusTraversable {
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 5cf09bb..1f525e9 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -9,9 +9,9 @@
#include "app/keyboard_code_conversion_win.h"
#include "app/theme_provider.h"
+#include "app/win/hwnd_util.h"
#include "app/win_util.h"
#include "base/i18n/rtl.h"
-#include "base/win_util.h"
#include "base/win/windows_version.h"
#include "gfx/canvas_skia_paint.h"
#include "gfx/font.h"
@@ -546,7 +546,7 @@ void WindowWin::Init(HWND parent, const gfx::Rect& bounds) {
set_window_ex_style(CalculateWindowExStyle());
WidgetWin::Init(parent, bounds);
- win_util::SetWindowUserData(GetNativeView(), this);
+ app::win::SetWindowUserData(GetNativeView(), this);
// Create the ClientView, add it to the NonClientView and add the
// NonClientView to the RootView. This will cause everything to be parented.
generated by cgit v1.1 at 2025-01-31 02:02:19 +0000