summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/app_base.gypi8
-rw-r--r--chrome/browser/aeropeek_manager.cc4
-rw-r--r--gfx/gfx.gyp6
-rw-r--r--gfx/window_impl.cc (renamed from app/win/window_impl.cc)6
-rw-r--r--gfx/window_impl.h (renamed from app/win/window_impl.h)10
-rw-r--r--tools/memory_watcher/hotkey.h4
-rw-r--r--views/controls/menu/menu_win.cc4
-rw-r--r--views/controls/scrollbar/native_scroll_bar_win.cc4
-rw-r--r--views/widget/widget_win.h4
-rw-r--r--webkit/default_plugin/plugin_impl_win.h4
-rw-r--r--webkit/tools/test_shell/foreground_helper.h4
11 files changed, 28 insertions, 30 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index 4cd5e66..966bf15 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -28,12 +28,6 @@
'tree_model.h',
'tree_node_iterator.h',
'tree_node_model.h',
- 'win/window_impl.cc',
- 'win/window_impl.h',
- ],
- 'include_dirs': [
- '..',
- '<(DEPTH)/third_party/wtl/include',
],
'conditions': [
['OS=="win"', {
@@ -297,8 +291,6 @@
'gfx/native_theme_win.cc',
'gfx/native_theme_win.h',
'os_exchange_data.cc',
- 'win/window_impl.cc',
- 'win/window_impl.h',
],
}],
['OS=="linux"', {
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc
index b9e6b14..ba0ca91 100644
--- a/chrome/browser/aeropeek_manager.cc
+++ b/chrome/browser/aeropeek_manager.cc
@@ -8,7 +8,6 @@
#include <shobjidl.h>
#include "app/win_util.h"
-#include "app/win/window_impl.h"
#include "base/command_line.h"
#include "base/scoped_comptr_win.h"
#include "base/scoped_handle_win.h"
@@ -29,6 +28,7 @@
#include "chrome/installer/util/browser_distribution.h"
#include "gfx/gdi_util.h"
#include "gfx/icon_util.h"
+#include "gfx/window_impl.h"
#include "skia/ext/image_operations.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -563,7 +563,7 @@ class SendLivePreviewTask : public Task {
// * Translating received messages for TabStrip.
// This class is used by the AeroPeekManager class, which is a proxy
// between TabStrip and Windows 7.
-class AeroPeekWindow : public app::WindowImpl {
+class AeroPeekWindow : public gfx::WindowImpl {
public:
AeroPeekWindow(HWND frame_window,
AeroPeekWindowDelegate* delegate,
diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp
index 592901c..668ac00 100644
--- a/gfx/gfx.gyp
+++ b/gfx/gfx.gyp
@@ -113,7 +113,13 @@
'icon_util.h',
'native_theme_win.cc',
'native_theme_win.h',
+ 'window_impl.cc',
+ 'window_impl.h'
],
+ 'include_dirs': [
+ '..',
+ '<(DEPTH)/third_party/wtl/include',
+ ],
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
diff --git a/app/win/window_impl.cc b/gfx/window_impl.cc
index 5488434..86eecce 100644
--- a/app/win/window_impl.cc
+++ b/gfx/window_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "app/win/window_impl.h"
+#include "gfx/window_impl.h"
#include <list>
@@ -10,7 +10,7 @@
#include "base/string_util.h"
#include "base/win_util.h"
-namespace app {
+namespace gfx {
static const DWORD kWindowDefaultChildStyle =
WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
@@ -223,4 +223,4 @@ std::wstring WindowImpl::GetWindowClassName() {
return name;
}
-} // namespace app
+} // namespace gfx
diff --git a/app/win/window_impl.h b/gfx/window_impl.h
index f63894e..228e9096 100644
--- a/app/win/window_impl.h
+++ b/gfx/window_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef APP_WIN_WINDOW_IMPL_H_
-#define APP_WIN_WINDOW_IMPL_H_
+#ifndef GFX_WINDOW_IMPL_H_
+#define GFX_WINDOW_IMPL_H_
#include <atlbase.h>
#include <atlapp.h>
@@ -16,7 +16,7 @@
#include "gfx/native_widget_types.h"
#include "gfx/rect.h"
-namespace app {
+namespace gfx {
// An interface implemented by classes that use message maps.
// ProcessWindowMessage is implemented by the BEGIN_MESSAGE_MAP_EX macro.
@@ -108,6 +108,6 @@ class WindowImpl : public MessageMapInterface {
DISALLOW_COPY_AND_ASSIGN(WindowImpl);
};
-} // namespace app
+} // namespace gfx
-#endif // APP_WIN_WINDOW_IMPL_H_
+#endif // GFX_WINDOW_IMPL_H_
diff --git a/tools/memory_watcher/hotkey.h b/tools/memory_watcher/hotkey.h
index 8989fef..3610d0f 100644
--- a/tools/memory_watcher/hotkey.h
+++ b/tools/memory_watcher/hotkey.h
@@ -6,11 +6,11 @@
#define TOOLS_MEMORY_WATCHER_HOTKEY_H_
#include "gfx/rect.h"
-#include "app/win/window_impl.h"
+#include "gfx/window_impl.h"
// HotKey handler.
// Programs wishing to register a hotkey can use this.
-class HotKeyHandler : public app::WindowImpl {
+class HotKeyHandler : public gfx::WindowImpl {
public:
HotKeyHandler(UINT modifiers, UINT vk)
: modifiers_(modifiers),
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index 5c976d5..05ada25 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -8,7 +8,6 @@
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
-#include "app/win/window_impl.h"
#include "base/keyboard_codes.h"
#include "base/logging.h"
#include "base/stl_util-inl.h"
@@ -16,6 +15,7 @@
#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 app::WindowImpl {
+class MenuHostWindow : public gfx::WindowImpl {
public:
MenuHostWindow(MenuWin* menu, HWND parent_window) : menu_(menu) {
int extended_style = 0;
diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc
index b3018e3..e434b99 100644
--- a/views/controls/scrollbar/native_scroll_bar_win.cc
+++ b/views/controls/scrollbar/native_scroll_bar_win.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#include <string>
-#include "app/win/window_impl.h"
#include "base/keyboard_codes.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 app::WindowImpl {
+class ScrollBarContainer : public gfx::WindowImpl {
public:
explicit ScrollBarContainer(ScrollBar* parent)
: parent_(parent),
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 866cc70..f52cf6f 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -12,9 +12,9 @@
#include <vector>
-#include "app/win/window_impl.h"
#include "base/message_loop.h"
#include "base/scoped_comptr_win.h"
+#include "gfx/window_impl.h"
#include "views/focus/focus_manager.h"
#include "views/layout_manager.h"
#include "views/widget/widget.h"
@@ -68,7 +68,7 @@ const int WM_NCUAHDRAWFRAME = 0xAF;
// then responsible for cleaning up after it.
//
///////////////////////////////////////////////////////////////////////////////
-class WidgetWin : public app::WindowImpl,
+class WidgetWin : public gfx::WindowImpl,
public Widget,
public MessageLoopForUI::Observer,
public FocusTraversable {
diff --git a/webkit/default_plugin/plugin_impl_win.h b/webkit/default_plugin/plugin_impl_win.h
index bc110ec..f2e9ba8 100644
--- a/webkit/default_plugin/plugin_impl_win.h
+++ b/webkit/default_plugin/plugin_impl_win.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "app/win/window_impl.h"
+#include "gfx/window_impl.h"
#include "third_party/npapi/bindings/npapi.h"
#include "webkit/default_plugin/install_dialog.h"
#include "webkit/default_plugin/plugin_database_handler.h"
@@ -34,7 +34,7 @@ class PluginDatabaseHandler;
// Provides the plugin installation functionality. This class is
// instantiated with the information like the mime type of the
// target plugin, the display mode, etc.
-class PluginInstallerImpl : public app::WindowImpl {
+class PluginInstallerImpl : public gfx::WindowImpl {
public:
static const int kRefreshPluginsMessage = WM_APP + 1;
static const int kInstallMissingPluginMessage = WM_APP + 2;
diff --git a/webkit/tools/test_shell/foreground_helper.h b/webkit/tools/test_shell/foreground_helper.h
index 146a8f0..1050236 100644
--- a/webkit/tools/test_shell/foreground_helper.h
+++ b/webkit/tools/test_shell/foreground_helper.h
@@ -5,8 +5,8 @@
#ifndef WEBKIT_TOOLS_TEST_SHELL_FOREGROUND_HELPER_H_
#define WEBKIT_TOOLS_TEST_SHELL_FOREGROUND_HELPER_H_
-#include "app/win/window_impl.h"
#include "base/logging.h"
+#include "gfx/window_impl.h"
// Helper class for moving a window to the foreground.
// Windows XP and later will not allow a window which is in the background to
@@ -15,7 +15,7 @@
// to be capable of moving to the foreground.
//
// This is probably leveraging a windows bug.
-class ForegroundHelper : public app::WindowImpl {
+class ForegroundHelper : public gfx::WindowImpl {
public:
BEGIN_MSG_MAP_EX(ForegroundHelper)
MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
generated by cgit v1.1 at 2025-01-18 05:14:41 +0000