Move native_widget_types and gtk_native_view_id_manager from base/gfx to

app/gfx in preparation for removing the base_gfx project. This also moves
base/window_impl.cc to app/win/window_impl because this file shouldn't be in
base.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/273017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28691 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 24 insertions, 25 deletions

diff --git a/views/controls/button/native_button_wrapper.h b/views/controls/button/native_button_wrapper.h
index d511702..55dc302 100644
--- a/views/controls/button/native_button_wrapper.h
+++ b/views/controls/button/native_button_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
 #define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_wrapper.h b/views/controls/combobox/native_combobox_wrapper.h
index 76f7855..d83e929 100644
--- a/views/controls/combobox/native_combobox_wrapper.h
+++ b/views/controls/combobox/native_combobox_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
 #define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 
 namespace gfx{
 class Size;
diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h
index b93ef98..e3e1c78 100644
--- a/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -5,8 +5,8 @@
 #ifndef CONTROLS_MENU_VIEWS_MENU_H_
 #define CONTROLS_MENU_VIEWS_MENU_H_
 
+#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
 #include "views/controls/menu/controller.h"
 
 class SkBitmap;
diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h
index c0e2c27..3eba306 100644
--- a/views/controls/menu/menu_2.h
+++ b/views/controls/menu/menu_2.h
@@ -5,7 +5,7 @@
 #ifndef CONTROLS_MENU_VIEWS_MENU_2_H_
 #define CONTROLS_MENU_VIEWS_MENU_2_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "views/controls/menu/menu_wrapper.h"
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index 852304f..a39ec44 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,12 +10,12 @@
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
+#include "app/win/window_impl.h"
 #include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "base/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 base::WindowImpl {
+class MenuHostWindow : public app::WindowImpl {
  public:
   MenuHostWindow(MenuWin* menu, HWND parent_window) : menu_(menu) {
     int extended_style = 0;
diff --git a/views/controls/menu/menu_wrapper.h b/views/controls/menu/menu_wrapper.h
index 3786002..740ece2 100644
--- a/views/controls/menu/menu_wrapper.h
+++ b/views/controls/menu/menu_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_MENU_MENU_WRAPPER_H_
 #define VIEWS_CONTROLS_MENU_MENU_WRAPPER_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 
 namespace gfx {
 class Point;
diff --git a/views/controls/menu/view_menu_delegate.h b/views/controls/menu/view_menu_delegate.h
index 3d6887b..c267e9b 100644
--- a/views/controls/menu/view_menu_delegate.h
+++ b/views/controls/menu/view_menu_delegate.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
 #define VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 
 namespace gfx {
 class Point;
diff --git a/views/controls/native/native_view_host.h b/views/controls/native/native_view_host.h
index 679e176..116fbe0 100644
--- a/views/controls/native/native_view_host.h
+++ b/views/controls/native/native_view_host.h
@@ -7,10 +7,9 @@
 
 #include <string>
 
+#include "app/gfx/native_widget_types.h"
 #include "views/view.h"
 
-#include "base/gfx/native_widget_types.h"
-
 namespace views {
 
 class NativeViewHostWrapper;
diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc
index 00b3b8c..b3018e3 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 "base/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 base::WindowImpl {
+class ScrollBarContainer : public app::WindowImpl {
  public:
   explicit ScrollBarContainer(ScrollBar* parent)
       : parent_(parent),
diff --git a/views/controls/slider/native_slider_wrapper.h b/views/controls/slider/native_slider_wrapper.h
index 100def5..bca3bde 100644
--- a/views/controls/slider/native_slider_wrapper.h
+++ b/views/controls/slider/native_slider_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_SLIDER_NATIVE_SLIDER_WRAPPER_H_
 #define VIEWS_CONTROLS_SLIDER_NATIVE_SLIDER_WRAPPER_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 
 namespace views {
 
diff --git a/views/controls/textfield/native_textfield_wrapper.h b/views/controls/textfield/native_textfield_wrapper.h
index 0a30ca3..c9cddcd 100644
--- a/views/controls/textfield/native_textfield_wrapper.h
+++ b/views/controls/textfield/native_textfield_wrapper.h
@@ -5,8 +5,8 @@
 #ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
 
+#include "app/gfx/native_widget_types.h"
 #include "base/string16.h"
-#include "base/gfx/native_widget_types.h"
 
 namespace gfx {
 class Insets;
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index facfaca..79266d0 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -17,7 +17,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 
 #ifdef UNIT_TEST
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #endif
 
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 3106f72..aec8911 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -9,8 +9,8 @@
 #include <map>
 #include <list>
 
+#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
 #include "views/accelerator.h"
 
 // The FocusManager class is used to handle focus traversal, store/restore
diff --git a/views/screen.h b/views/screen.h
index 013cb06..fd37424 100644
--- a/views/screen.h
+++ b/views/screen.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_SCREEN_H_
 #define VIEWS_SCREEN_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 
diff --git a/views/view.h b/views/view.h
index 311e5ce..cb44e2a 100644
--- a/views/view.h
+++ b/views/view.h
@@ -13,8 +13,8 @@
 #include <string>
 #include <vector>
 
+#include "app/gfx/native_widget_types.h"
 #include "app/os_exchange_data.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "views/accelerator.h"
diff --git a/views/widget/tooltip_manager_win.h b/views/widget/tooltip_manager_win.h
index 7b8f467..af5e3fe 100644
--- a/views/widget/tooltip_manager_win.h
+++ b/views/widget/tooltip_manager_win.h
@@ -9,8 +9,8 @@
 #include <commctrl.h>
 #include <string>
 
+#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/task.h"
 #include "views/widget/tooltip_manager.h"
 
diff --git a/views/widget/widget.h b/views/widget/widget.h
index 829a9d0f..7c60e41 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_WIDGET_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 
 class ThemeProvider;
 
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 0615c14e..147072e 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,10 +10,10 @@
 #include <atlcrack.h>
 #include <atlmisc.h>
 
+#include "app/win/window_impl.h"
 #include "base/message_loop.h"
 #include "base/scoped_comptr_win.h"
 #include "base/system_monitor.h"
-#include "base/window_impl.h"
 #include "views/focus/focus_manager.h"
 #include "views/layout_manager.h"
 #include "views/widget/widget.h"
@@ -66,7 +66,7 @@ const int WM_NCUAHDRAWFRAME = 0xAF;
 //  then responsible for cleaning up after it.
 //
 ///////////////////////////////////////////////////////////////////////////////
-class WidgetWin : public base::WindowImpl,
+class WidgetWin : public app::WindowImpl,
                   public Widget,
                   public MessageLoopForUI::Observer,
                   public FocusTraversable,
diff --git a/views/window/window.h b/views/window/window.h
index 6bb1075..f2f9e34 100644
--- a/views/window/window.h
+++ b/views/window/window.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_WINDOW_WINDOW_H_
 #define VIEWS_WINDOW_WINDOW_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 
 namespace gfx {
 class Font;