summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/app/content_main_runner.cc2
-rw-r--r--content/browser/plugin_service_impl.cc4
-rw-r--r--content/browser/renderer_host/backing_store_win.cc2
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc1
-rw-r--r--content/browser/renderer_host/render_widget_host_view_base.cc8
-rw-r--r--content/browser/renderer_host/render_widget_host_view_browsertest.cc4
-rw-r--r--content/browser/renderer_host/render_widget_host_view_win.cc18
-rw-r--r--content/browser/web_contents/web_contents_view_win.h4
-rw-r--r--content/browser/zygote_host/zygote_host_impl_linux.cc1
-rw-r--r--content/child/npapi/webplugin_delegate_impl_win.cc6
-rw-r--r--content/shell/app/shell_main_delegate.cc1
-rw-r--r--content/shell/browser/shell_win.cc16
12 files changed, 35 insertions, 32 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 7bfc37b..949514a 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -49,7 +49,7 @@
#include "sandbox/win/src/sandbox_types.h"
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"
-#include "ui/gfx/dpi_win.h"
+#include "ui/gfx/win/dpi.h"
#include "webkit/common/user_agent/user_agent.h"
#if defined(USE_TCMALLOC)
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 3837223..5a79f7d 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -33,7 +33,7 @@
#if defined(OS_WIN)
#include "content/common/plugin_constants_win.h"
-#include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/win/hwnd_util.h"
#endif
#if defined(OS_POSIX)
@@ -837,7 +837,7 @@ bool PluginServiceImpl::GetPluginInfoFromWindow(
}
bool PluginServiceImpl::IsPluginWindow(HWND window) {
- return ui::GetClassName(window) == base::string16(kNativeWindowClassName);
+ return gfx::GetClassName(window) == base::string16(kNativeWindowClassName);
}
#endif
diff --git a/content/browser/renderer_host/backing_store_win.cc b/content/browser/renderer_host/backing_store_win.cc
index 9992fde..8e761dd 100644
--- a/content/browser/renderer_host/backing_store_win.cc
+++ b/content/browser/renderer_host/backing_store_win.cc
@@ -9,10 +9,10 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/public/common/content_switches.h"
#include "skia/ext/platform_canvas.h"
-#include "ui/gfx/dpi_win.h"
#include "ui/gfx/gdi_util.h"
#include "ui/gfx/rect_conversions.h"
#include "ui/gfx/size_conversions.h"
+#include "ui/gfx/win/dpi.h"
#include "ui/surface/transport_dib.h"
namespace content {
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 4981d60..1c958c7 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -129,6 +129,7 @@
#include "net/url_request/url_request_context_getter.h"
#include "ppapi/shared_impl/ppapi_switches.h"
#include "ui/base/ui_base_switches.h"
+#include "ui/gfx/switches.h"
#include "ui/gl/gl_switches.h"
#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
#include "webkit/common/resource_type.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index 11248c3..5718103 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -29,9 +29,9 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/child_process_data.h"
#include "content/public/common/content_switches.h"
-#include "ui/base/win/hwnd_util.h"
-#include "ui/gfx/dpi_win.h"
#include "ui/gfx/gdi_util.h"
+#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/win/hwnd_util.h"
#endif
#if defined(TOOLKIT_GTK)
@@ -118,7 +118,7 @@ LRESULT CALLBACK PluginWrapperWindowProc(HWND window, unsigned int message,
}
bool IsPluginWrapperWindow(HWND window) {
- return ui::GetClassNameW(window) ==
+ return gfx::GetClassNameW(window) ==
string16(kWrapperNativeWindowClassName);
}
@@ -151,7 +151,7 @@ HWND ReparentWindow(HWND window, HWND parent) {
MAKEINTATOM(atom), 0,
WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
0, 0, 0, 0, parent, 0, instance, 0);
- ui::CheckWindowCreated(new_parent);
+ gfx::CheckWindowCreated(new_parent);
::SetParent(window, new_parent);
// How many times we try to find a PluginProcessHost whose process matches
// the HWND.
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index 4b7c75e..9adc504 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -37,7 +37,7 @@
#endif
#if defined(OS_WIN)
-#include "ui/gfx/dpi_win.h"
+#include "ui/gfx/win/dpi.h"
#endif
namespace content {
@@ -835,7 +835,7 @@ class CompositingRenderWidgetHostViewTabCaptureHighDPI
cmd->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
base::StringPrintf("%f", scale()));
#if defined(OS_WIN)
- cmd->AppendSwitchASCII(gfx::switches::kHighDPISupport, "1");
+ cmd->AppendSwitchASCII(switches::kHighDPISupport, "1");
gfx::EnableHighDPISupport();
#endif
}
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index c8c4dc4..a798404 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -67,15 +67,15 @@
#include "ui/base/touch/touch_enabled.h"
#include "ui/base/ui_base_switches.h"
#include "ui/base/view_prop.h"
-#include "ui/base/win/hwnd_util.h"
#include "ui/base/win/mouse_wheel_util.h"
#include "ui/base/win/touch_input.h"
#include "ui/gfx/canvas.h"
-#include "ui/gfx/dpi_win.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/rect_conversions.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/text_elider.h"
+#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/win/hwnd_util.h"
#include "webkit/common/cursors/webcursor.h"
#include "win8/util/win8_util.h"
@@ -451,7 +451,7 @@ void RenderWidgetHostViewWin::InitAsFullscreen(
gfx::Rect pos = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
reference_host_view->GetNativeView()).bounds();
is_fullscreen_ = true;
- DoPopupOrFullscreenInit(ui::GetWindowToParentTo(true), pos, 0);
+ DoPopupOrFullscreenInit(gfx::GetWindowToParentTo(true), pos, 0);
}
RenderWidgetHost* RenderWidgetHostViewWin::GetRenderWidgetHost() const {
@@ -575,7 +575,7 @@ void RenderWidgetHostViewWin::CleanupCompositorWindow() {
if (!compositor_host_window_)
return;
- ui::SetWindowUserData(compositor_host_window_, NULL);
+ gfx::SetWindowUserData(compositor_host_window_, NULL);
// Hide the compositor and parent it to the desktop rather than destroying
// it immediately. The GPU process has a grace period to stop accessing the
@@ -626,7 +626,7 @@ void RenderWidgetHostViewWin::Show() {
}
void RenderWidgetHostViewWin::Hide() {
- if (!is_fullscreen_ && GetParent() == ui::GetWindowToParentTo(true)) {
+ if (!is_fullscreen_ && GetParent() == gfx::GetWindowToParentTo(true)) {
LOG(WARNING) << "Hide() called twice in a row: " << this << ":"
<< GetParent();
return;
@@ -2318,7 +2318,7 @@ LRESULT RenderWidgetHostViewWin::OnMouseActivate(UINT message,
::ScreenToClient(m_hWnd, &cursor_pos);
HWND child_window = ::RealChildWindowFromPoint(m_hWnd, cursor_pos);
if (::IsWindow(child_window) && child_window != m_hWnd) {
- if (ui::GetClassName(child_window) == kWrapperNativeWindowClassName)
+ if (gfx::GetClassName(child_window) == kWrapperNativeWindowClassName)
child_window = ::GetWindow(child_window, GW_CHILD);
::SetFocus(child_window);
@@ -2464,7 +2464,7 @@ static void PaintCompositorHostWindow(HWND hWnd) {
BeginPaint(hWnd, &paint);
RenderWidgetHostViewWin* win = static_cast<RenderWidgetHostViewWin*>(
- ui::GetWindowUserData(hWnd));
+ gfx::GetWindowUserData(hWnd));
// Trigger composite to rerender window.
if (win)
win->AcceleratedPaint(paint.hdc);
@@ -2563,9 +2563,9 @@ gfx::GLSurfaceHandle RenderWidgetHostViewWin::GetCompositingSurface() {
MAKEINTATOM(atom), 0,
WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_DISABLED,
0, 0, width, height, m_hWnd, 0, instance, 0);
- ui::CheckWindowCreated(compositor_host_window_);
+ gfx::CheckWindowCreated(compositor_host_window_);
- ui::SetWindowUserData(compositor_host_window_, this);
+ gfx::SetWindowUserData(compositor_host_window_, this);
gfx::GLSurfaceHandle surface_handle(compositor_host_window_,
gfx::NATIVE_TRANSPORT);
diff --git a/content/browser/web_contents/web_contents_view_win.h b/content/browser/web_contents/web_contents_view_win.h
index 3ca6b48..adfe675 100644
--- a/content/browser/web_contents/web_contents_view_win.h
+++ b/content/browser/web_contents/web_contents_view_win.h
@@ -13,7 +13,7 @@
#include "content/common/drag_event_source_info.h"
#include "content/port/browser/render_view_host_delegate_view.h"
#include "content/port/browser/web_contents_view_port.h"
-#include "ui/base/win/window_impl.h"
+#include "ui/gfx/win/window_impl.h"
namespace ui {
class HWNDMessageFilter;
@@ -29,7 +29,7 @@ class WebDragDest;
class CONTENT_EXPORT WebContentsViewWin
: public WebContentsViewPort,
public RenderViewHostDelegateView,
- public ui::WindowImpl {
+ public gfx::WindowImpl {
public:
WebContentsViewWin(WebContentsImpl* web_contents,
WebContentsViewDelegate* delegate);
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
index 3629a84..fea43b5 100644
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -37,6 +37,7 @@
#include "sandbox/linux/suid/client/setuid_sandbox_client.h"
#include "sandbox/linux/suid/common/sandbox.h"
#include "ui/base/ui_base_switches.h"
+#include "ui/gfx/switches.h"
#if defined(USE_TCMALLOC)
#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
diff --git a/content/child/npapi/webplugin_delegate_impl_win.cc b/content/child/npapi/webplugin_delegate_impl_win.cc
index e788cb2..f6d0540 100644
--- a/content/child/npapi/webplugin_delegate_impl_win.cc
+++ b/content/child/npapi/webplugin_delegate_impl_win.cc
@@ -31,8 +31,8 @@
#include "content/public/common/content_constants.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/win/hwnd_util.h"
-#include "ui/gfx/dpi_win.h"
+#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/win/hwnd_util.h"
#include "webkit/common/cursors/webcursor.h"
using WebKit::WebKeyboardEvent;
@@ -1462,7 +1462,7 @@ FARPROC WINAPI WebPluginDelegateImpl::GetProcAddressPatch(HMODULE module,
void WebPluginDelegateImpl::HandleCaptureForMessage(HWND window,
UINT message) {
- if (ui::GetClassName(window) != base::string16(kNativeWindowClassName))
+ if (gfx::GetClassName(window) != base::string16(kNativeWindowClassName))
return;
switch (message) {
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index c089007..b5fbb8ec 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -22,6 +22,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"
+#include "ui/gfx/switches.h"
#include "ui/gl/gl_switches.h"
#include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
diff --git a/content/shell/browser/shell_win.cc b/content/shell/browser/shell_win.cc
index d1bb402..2854e5c 100644
--- a/content/shell/browser/shell_win.cc
+++ b/content/shell/browser/shell_win.cc
@@ -14,7 +14,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "content/shell/app/resource.h"
-#include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/win/hwnd_util.h"
namespace {
@@ -52,8 +52,8 @@ void Shell::PlatformExit() {
void Shell::PlatformCleanUp() {
// When the window is destroyed, tell the Edit field to forget about us,
// otherwise we will crash.
- ui::SetWindowProc(url_edit_view_, default_edit_wnd_proc_);
- ui::SetWindowUserData(url_edit_view_, NULL);
+ gfx::SetWindowProc(url_edit_view_, default_edit_wnd_proc_);
+ gfx::SetWindowUserData(url_edit_view_, NULL);
}
void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
@@ -89,7 +89,7 @@ void Shell::PlatformCreateWindow(int width, int height) {
WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
NULL, NULL, instance_handle_, NULL);
- ui::SetWindowUserData(window_, this);
+ gfx::SetWindowUserData(window_, this);
HWND hwnd;
int x = 0;
@@ -124,9 +124,9 @@ void Shell::PlatformCreateWindow(int width, int height) {
ES_AUTOVSCROLL | ES_AUTOHSCROLL,
x, 0, 0, 0, window_, 0, instance_handle_, 0);
- default_edit_wnd_proc_ = ui::SetWindowProc(url_edit_view_,
+ default_edit_wnd_proc_ = gfx::SetWindowProc(url_edit_view_,
Shell::EditWndProc);
- ui::SetWindowUserData(url_edit_view_, this);
+ gfx::SetWindowUserData(url_edit_view_, this);
ShowWindow(window_, SW_SHOW);
@@ -192,7 +192,7 @@ ATOM Shell::RegisterWindowClass() {
LRESULT CALLBACK Shell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
LPARAM lParam) {
- Shell* shell = static_cast<Shell*>(ui::GetWindowUserData(hwnd));
+ Shell* shell = static_cast<Shell*>(gfx::GetWindowUserData(hwnd));
switch (message) {
case WM_COMMAND: {
@@ -254,7 +254,7 @@ LRESULT CALLBACK Shell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
LRESULT CALLBACK Shell::EditWndProc(HWND hwnd, UINT message,
WPARAM wParam, LPARAM lParam) {
- Shell* shell = static_cast<Shell*>(ui::GetWindowUserData(hwnd));
+ Shell* shell = static_cast<Shell*>(gfx::GetWindowUserData(hwnd));
switch (message) {
case WM_CHAR:
generated by cgit v1.1 at 2025-01-26 01:17:15 +0000