diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-11 20:21:32 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-11 20:21:32 +0000 |
commit | 010ea08a647dfdc4c75aaab2fca65128f50f2379 (patch) | |
tree | 6cd61817ffebd7d50fa55e5654dd967a3c69617e /chrome | |
parent | b44dbd15aeb4dbe7a5be36f7f5c55e6cddf0bac9 (diff) | |
download | chromium_src-010ea08a647dfdc4c75aaab2fca65128f50f2379.zip chromium_src-010ea08a647dfdc4c75aaab2fca65128f50f2379.tar.gz chromium_src-010ea08a647dfdc4c75aaab2fca65128f50f2379.tar.bz2 |
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
Diffstat (limited to 'chrome')
74 files changed, 93 insertions, 89 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view.h b/chrome/browser/autocomplete/autocomplete_edit_view.h index cba7342..7a410b6 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view.h @@ -13,7 +13,7 @@ #include <string> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/common/page_transition_types.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/automation/automation_window_tracker.h b/chrome/browser/automation/automation_window_tracker.h index 53a48aa2..0823634 100644 --- a/chrome/browser/automation/automation_window_tracker.h +++ b/chrome/browser/automation/automation_window_tracker.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_WINDOW_TRACKER_H_ #define CHROME_BROWSER_AUTOMATION_AUTOMATION_WINDOW_TRACKER_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "build/build_config.h" #include "chrome/browser/automation/automation_resource_tracker.h" #include "chrome/common/native_window_notification_source.h" diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h index 4613626..92705dc 100644 --- a/chrome/browser/automation/ui_controls.h +++ b/chrome/browser/automation/ui_controls.h @@ -13,7 +13,7 @@ #include <wtypes.h> #endif -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/gfx/point.h" #include "base/keyboard_codes.h" diff --git a/chrome/browser/blocked_popup_container.h b/chrome/browser/blocked_popup_container.h index 781def3..23b4547 100644 --- a/chrome/browser/blocked_popup_container.h +++ b/chrome/browser/blocked_popup_container.h @@ -17,7 +17,7 @@ #include <string> #include <vector> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/gfx/rect.h" #include "base/string16.h" #include "chrome/browser/tab_contents/constrained_window.h" diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/bookmarks/bookmark_context_menu_controller.h index 03a57c4..5c8c20b 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller.h +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.h @@ -7,8 +7,8 @@ #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "chrome/browser/bookmarks/bookmark_model.h" class Browser; diff --git a/chrome/browser/bookmarks/bookmark_drop_info.h b/chrome/browser/bookmarks/bookmark_drop_info.h index d5ed4de3..77e68af 100644 --- a/chrome/browser/bookmarks/bookmark_drop_info.h +++ b/chrome/browser/bookmarks/bookmark_drop_info.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_ +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/timer.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" diff --git a/chrome/browser/bookmarks/bookmark_editor.h b/chrome/browser/bookmarks/bookmark_editor.h index 982c314..6c82cbd 100644 --- a/chrome/browser/bookmarks/bookmark_editor.h +++ b/chrome/browser/bookmarks/bookmark_editor.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_EDITOR_H_ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_EDITOR_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" class BookmarkNode; class Profile; diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h index 116d41f..513f479 100644 --- a/chrome/browser/bookmarks/bookmark_utils.h +++ b/chrome/browser/bookmarks/bookmark_utils.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/history/snippet.h" diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 25b4397..ca70a44 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/gfx/native_widget_types.h" #include "base/file_path.h" -#include "base/gfx/native_widget_types.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/values.h" diff --git a/chrome/browser/browser_window.h b/chrome/browser/browser_window.h index b26b447..4e47efb 100644 --- a/chrome/browser/browser_window.h +++ b/chrome/browser/browser_window.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_BROWSER_WINDOW_H_ #define CHROME_BROWSER_BROWSER_WINDOW_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/browser/tab_contents/navigation_entry.h" class Browser; diff --git a/chrome/browser/cocoa/download_util_mac.mm b/chrome/browser/cocoa/download_util_mac.mm index 19462c1..a38487f 100644 --- a/chrome/browser/cocoa/download_util_mac.mm +++ b/chrome/browser/cocoa/download_util_mac.mm @@ -6,7 +6,7 @@ #include "chrome/browser/cocoa/download_util_mac.h" -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_manager.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/cocoa/extension_view_mac.h b/chrome/browser/cocoa/extension_view_mac.h index f162fd7..8abb481 100644 --- a/chrome/browser/cocoa/extension_view_mac.h +++ b/chrome/browser/cocoa/extension_view_mac.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_COCOA_EXTENSION_VIEW_MAC_H_ #define CHROME_BROWSER_COCOA_EXTENSION_VIEW_MAC_H_ +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" class Browser; diff --git a/chrome/browser/dock_info.h b/chrome/browser/dock_info.h index 4f6d476..bc02612 100644 --- a/chrome/browser/dock_info.h +++ b/chrome/browser/dock_info.h @@ -7,7 +7,7 @@ #include <set> -#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/chrome/browser/dock_info_gtk.cc b/chrome/browser/dock_info_gtk.cc index a4d3f08..64a86ef 100644 --- a/chrome/browser/dock_info_gtk.cc +++ b/chrome/browser/dock_info_gtk.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.h> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/logging.h" #include "base/task.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/download/download_file.h b/chrome/browser/download/download_file.h index 63fb1e7..79195ec 100644 --- a/chrome/browser/download/download_file.h +++ b/chrome/browser/download/download_file.h @@ -44,9 +44,9 @@ #include <map> #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/file_path.h" -#include "base/gfx/native_widget_types.h" #include "base/hash_tables.h" #include "base/lock.h" #include "base/ref_counted.h" diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h index 0a320db..ba0e368 100644 --- a/chrome/browser/download/download_util.h +++ b/chrome/browser/download/download_util.h @@ -10,8 +10,8 @@ #include <set> #include <string> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/task.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h index 9d97b73..6a2fc68 100644 --- a/chrome/browser/extensions/extension_install_ui.h +++ b/chrome/browser/extensions/extension_install_ui.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_UI_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_UI_H_ +#include "app/gfx/native_widget_types.h" #include "base/file_path.h" -#include "base/gfx/native_widget_types.h" #include "base/ref_counted.h" #include <string> diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h index 5b9d252..ec8d8f4 100644 --- a/chrome/browser/first_run.h +++ b/chrome/browser/first_run.h @@ -8,8 +8,8 @@ #include <string> #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "chrome/browser/browser_process_impl.h" class CommandLine; diff --git a/chrome/browser/fonts_languages_window.h b/chrome/browser/fonts_languages_window.h index 81f01e8..aab6b6b 100644 --- a/chrome/browser/fonts_languages_window.h +++ b/chrome/browser/fonts_languages_window.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FONTS_LANGUAGES_WINDOW_H_ #define CHROME_BROWSER_FONTS_LANGUAGES_WINDOW_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" class Profile; diff --git a/chrome/browser/gears_integration.h b/chrome/browser/gears_integration.h index 724f3e5..ac2c3ab 100644 --- a/chrome/browser/gears_integration.h +++ b/chrome/browser/gears_integration.h @@ -7,7 +7,7 @@ #include <string> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/task.h" #include "chrome/common/gears_api.h" diff --git a/chrome/browser/gtk/bookmark_context_menu_gtk.h b/chrome/browser/gtk/bookmark_context_menu_gtk.h index a84db53..efe684d 100644 --- a/chrome/browser/gtk/bookmark_context_menu_gtk.h +++ b/chrome/browser/gtk/bookmark_context_menu_gtk.h @@ -7,8 +7,8 @@ #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/gtk/menu_gtk.h" diff --git a/chrome/browser/gtk/download_shelf_gtk.h b/chrome/browser/gtk/download_shelf_gtk.h index 94a34e2..509109e 100644 --- a/chrome/browser/gtk/download_shelf_gtk.h +++ b/chrome/browser/gtk/download_shelf_gtk.h @@ -9,7 +9,7 @@ #include <vector> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/gtk/slide_animator_gtk.h" diff --git a/chrome/browser/gtk/extension_view_gtk.h b/chrome/browser/gtk/extension_view_gtk.h index 2ae49c2..6f67f53 100644 --- a/chrome/browser/gtk/extension_view_gtk.h +++ b/chrome/browser/gtk/extension_view_gtk.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_GTK_EXTENSION_VIEW_GTK_H_ #define CHROME_BROWSER_GTK_EXTENSION_VIEW_GTK_H_ +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" class Browser; diff --git a/chrome/browser/gtk/tab_contents_container_gtk.cc b/chrome/browser/gtk/tab_contents_container_gtk.cc index 2c64dff..9425194 100644 --- a/chrome/browser/gtk/tab_contents_container_gtk.cc +++ b/chrome/browser/gtk/tab_contents_container_gtk.cc @@ -4,8 +4,8 @@ #include "chrome/browser/gtk/tab_contents_container_gtk.h" +#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" -#include "base/gfx/native_widget_types.h" #include "chrome/browser/gtk/gtk_floating_container.h" #include "chrome/browser/gtk/status_bubble_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/gtk/tab_contents_drag_source.h b/chrome/browser/gtk/tab_contents_drag_source.h index 1df7df8..cdcc3ed 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.h +++ b/chrome/browser/gtk/tab_contents_drag_source.h @@ -7,8 +7,8 @@ #include <gtk/gtk.h> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/message_loop.h" #include "webkit/api/public/WebDragOperation.h" diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index 8fc3587..6daafbb 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -10,8 +10,8 @@ #include "build/build_config.h" +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/ref_counted.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/input_window_dialog.h b/chrome/browser/input_window_dialog.h index 56bdfb9..e60e3f6 100644 --- a/chrome/browser/input_window_dialog.h +++ b/chrome/browser/input_window_dialog.h @@ -7,8 +7,8 @@ #include <string> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" // Cross platform access to a modal input window. class InputWindowDialog { diff --git a/chrome/browser/page_info_window.h b/chrome/browser/page_info_window.h index 737c884..bdbee94 100644 --- a/chrome/browser/page_info_window.h +++ b/chrome/browser/page_info_window.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PAGE_INFO_WINDOW_H_ #define CHROME_BROWSER_PAGE_INFO_WINDOW_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/browser/tab_contents/navigation_entry.h" class Profile; diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 350319b..a24885b 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -13,6 +13,7 @@ #include <vector> #include "app/app_switches.h" +#include "app/gfx/native_widget_types.h" #include "base/command_line.h" #if defined(OS_POSIX) #include "base/global_descriptors_posix.h" @@ -20,7 +21,6 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" -#include "base/gfx/native_widget_types.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" @@ -66,7 +66,7 @@ #endif #if defined(OS_LINUX) -#include "base/gfx/gtk_native_view_id_manager.h" +#include "app/gfx/gtk_native_view_id_manager.h" #endif #if defined(OS_MACOSX) diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h index e397c4c..3ce66b2 100644 --- a/chrome/browser/plugin_process_host.h +++ b/chrome/browser/plugin_process_host.h @@ -11,8 +11,8 @@ #include <queue> #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/net/resolve_proxy_msg_helper.h" diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h index cf4badc..3d0353f 100644 --- a/chrome/browser/printing/print_job.h +++ b/chrome/browser/printing/print_job.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_JOB_H_ #define CHROME_BROWSER_PRINTING_PRINT_JOB_H_ +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/message_loop.h" #include "chrome/browser/printing/print_job_worker_owner.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index e06a7e8..c7fc904 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -11,9 +11,9 @@ #include <windows.h> #endif +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/file_path.h" -#include "base/gfx/native_widget_types.h" #include "base/logging.h" #include "base/non_thread_safe.h" #include "base/ref_counted.h" diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index fdc6d0e..af14f52 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -7,9 +7,9 @@ #include <string> #include <vector> +#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "base/gfx/native_widget_types.h" #include "base/json_reader.h" #include "base/string_util.h" #include "base/time.h" diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index 2438e16..b672924 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -8,8 +8,8 @@ #include <queue> #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/process.h" -#include "base/gfx/native_widget_types.h" #include "base/gfx/size.h" #include "base/scoped_ptr.h" #include "base/timer.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h index 05f3f6d..b0819ad 100644 --- a/chrome/browser/renderer_host/render_widget_host_view.h +++ b/chrome/browser/renderer_host/render_widget_host_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/shared_memory.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h index 933629e..3cc8281 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h @@ -11,7 +11,7 @@ #include <vector> #include <string> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "base/time.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 688179c..5645ef6 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -5,8 +5,8 @@ #include "chrome/browser/renderer_host/resource_message_filter.h" #include "app/clipboard/clipboard.h" +#include "app/gfx/native_widget_types.h" #include "base/command_line.h" -#include "base/gfx/native_widget_types.h" #include "base/histogram.h" #include "base/process_util.h" #include "base/thread.h" diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index b284d0d..8084e72 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -13,9 +13,9 @@ #include <vector> #include "app/clipboard/clipboard.h" +#include "app/gfx/native_widget_types.h" #include "base/file_path.h" #include "base/gfx/rect.h" -#include "base/gfx/native_widget_types.h" #include "base/process.h" #include "base/ref_counted.h" #include "base/shared_memory.h" diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc index e911edf..c1b29e6 100644 --- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc @@ -8,9 +8,9 @@ #include <map> #include "app/clipboard/clipboard.h" +#include "app/gfx/gtk_native_view_id_manager.h" #include "app/l10n_util.h" #include "base/file_util.h" -#include "base/gfx/gtk_native_view_id_manager.h" #include "base/path_service.h" #include "base/singleton.h" #include "chrome/browser/chrome_thread.h" diff --git a/chrome/browser/search_engines/edit_search_engine_controller.h b/chrome/browser/search_engines/edit_search_engine_controller.h index 6333dbf..1031fbd 100644 --- a/chrome/browser/search_engines/edit_search_engine_controller.h +++ b/chrome/browser/search_engines/edit_search_engine_controller.h @@ -7,7 +7,7 @@ #include <string> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" class Profile; class TemplateURL; diff --git a/chrome/browser/search_engines/template_url_fetcher.h b/chrome/browser/search_engines/template_url_fetcher.h index c6527d6..bbd314f 100644 --- a/chrome/browser/search_engines/template_url_fetcher.h +++ b/chrome/browser/search_engines/template_url_fetcher.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_TEMPLATE_URL_FETCHER_H_ #define CHROME_BROWSER_TEMPLATE_URL_FETCHER_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/scoped_vector.h" class GURL; diff --git a/chrome/browser/shell_dialogs.h b/chrome/browser/shell_dialogs.h index f9a3baa..78eaf55 100644 --- a/chrome/browser/shell_dialogs.h +++ b/chrome/browser/shell_dialogs.h @@ -8,8 +8,8 @@ #include <string> #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/file_path.h" -#include "base/gfx/native_widget_types.h" #include "base/ref_counted.h" #include "base/string16.h" diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index a85c3bb..b90d68b 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -12,8 +12,8 @@ #include <string> #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/gfx/rect.h" #include "base/scoped_ptr.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h index c61a4d7..7ed952f 100644 --- a/chrome/browser/tab_contents/tab_contents_delegate.h +++ b/chrome/browser/tab_contents/tab_contents_delegate.h @@ -5,10 +5,9 @@ #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_ #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_ +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/gfx/rect.h" - #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/page_transition_types.h" diff --git a/chrome/browser/tab_contents/tab_contents_view.h b/chrome/browser/tab_contents/tab_contents_view.h index bc76ae8..fcef017 100644 --- a/chrome/browser/tab_contents/tab_contents_view.h +++ b/chrome/browser/tab_contents/tab_contents_view.h @@ -8,8 +8,8 @@ #include <map> #include <string> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" diff --git a/chrome/browser/tab_contents/web_drag_source.h b/chrome/browser/tab_contents/web_drag_source.h index f80c6c6..7896dd4 100644 --- a/chrome/browser/tab_contents/web_drag_source.h +++ b/chrome/browser/tab_contents/web_drag_source.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_ #define CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_ +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/gfx/point.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/views/blocked_popup_container_view_win.h b/chrome/browser/views/blocked_popup_container_view_win.h index ad27ea5..b09763d 100644 --- a/chrome/browser/views/blocked_popup_container_view_win.h +++ b/chrome/browser/views/blocked_popup_container_view_win.h @@ -9,8 +9,8 @@ #include <utility> #include <vector> +#include "app/gfx/native_widget_types.h" #include "app/slide_animation.h" -#include "base/gfx/native_widget_types.h" #include "base/gfx/rect.h" #include "chrome/browser/blocked_popup_container.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" diff --git a/chrome/browser/views/bookmark_menu_controller_views.h b/chrome/browser/views/bookmark_menu_controller_views.h index 1b33c35..0fb720a 100644 --- a/chrome/browser/views/bookmark_menu_controller_views.h +++ b/chrome/browser/views/bookmark_menu_controller_views.h @@ -7,7 +7,7 @@ #include <map> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/views/bookmark_context_menu.h" diff --git a/chrome/browser/views/browser_dialogs.h b/chrome/browser/views/browser_dialogs.h index 805f565..d4c2420 100644 --- a/chrome/browser/views/browser_dialogs.h +++ b/chrome/browser/views/browser_dialogs.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_ #define CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" // This file contains functions for running a variety of browser dialogs and // popups. The dialogs here are the ones that the caller does not need to diff --git a/chrome/browser/views/confirm_message_box_dialog.h b/chrome/browser/views/confirm_message_box_dialog.h index 9b27536..b2ca806 100644 --- a/chrome/browser/views/confirm_message_box_dialog.h +++ b/chrome/browser/views/confirm_message_box_dialog.h @@ -7,8 +7,8 @@ #include <string> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "views/controls/label.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/views/find_bar_host.h b/chrome/browser/views/find_bar_host.h index 6c2546f3..a67b714 100644 --- a/chrome/browser/views/find_bar_host.h +++ b/chrome/browser/views/find_bar_host.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_ #include "app/animation.h" +#include "app/gfx/native_widget_types.h" #include "base/gfx/rect.h" -#include "base/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "chrome/browser/find_bar.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h index f4f2c2e..c7e8d77 100644 --- a/chrome/browser/views/frame/browser_view.h +++ b/chrome/browser/views/frame/browser_view.h @@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "base/timer.h" #include "build/build_config.h" diff --git a/chrome/browser/views/repost_form_warning_view.h b/chrome/browser/views/repost_form_warning_view.h index 3c8538b..d1da592b1 100644 --- a/chrome/browser/views/repost_form_warning_view.h +++ b/chrome/browser/views/repost_form_warning_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_ #define CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/common/notification_registrar.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/views/tabs/native_view_photobooth.h b/chrome/browser/views/tabs/native_view_photobooth.h index 3d639b3..913cb0d 100644 --- a/chrome/browser/views/tabs/native_view_photobooth.h +++ b/chrome/browser/views/tabs/native_view_photobooth.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_ #define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" namespace gfx { class Canvas; diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index a06ebb7..eac73f5 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -4596,6 +4596,7 @@ 'chrome_resources', 'chrome_strings', 'test_support_ui', + '../app/app.gyp:app_base', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -5449,6 +5450,7 @@ 'type': 'executable', 'msvs_guid': '265C427B-D1FF-4922-A47C-0754DDFF52E1', 'dependencies': [ + '../app/app.gyp:app_base', '../base/base.gyp:base', '../webkit/webkit.gyp:glue', 'debugger', @@ -5478,6 +5480,7 @@ 'syncapi', 'chrome_resources', 'chrome_strings', + '../app/app.gyp:app_base', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', @@ -5771,6 +5774,7 @@ 'chrome_strings', 'debugger', 'test_support_common', + '../app/app.gyp:app_base', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h index 3af3904..3535989 100644 --- a/chrome/common/common_param_traits.h +++ b/chrome/common/common_param_traits.h @@ -13,7 +13,7 @@ #include <vector> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/transport_dib.h" #include "ipc/ipc_message_utils.h" diff --git a/chrome/common/native_window_notification_source.h b/chrome/common/native_window_notification_source.h index 1cb270d..7db1ec8 100644 --- a/chrome/common/native_window_notification_source.h +++ b/chrome/common/native_window_notification_source.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_NATIVE_WINDOW_NOTIFICATION_SOURCE_H_ #define CHROME_COMMON_NATIVE_WINDOW_NOTIFICATION_SOURCE_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "chrome/common/notification_source.h" // Specialization of the Source class for native windows. On Windows, these are diff --git a/chrome/common/platform_util.h b/chrome/common/platform_util.h index cb3c5e0..2aa90cb 100644 --- a/chrome/common/platform_util.h +++ b/chrome/common/platform_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_PLATFORM_UTIL_H_ #define CHROME_COMMON_PLATFORM_UTIL_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/string16.h" class FilePath; diff --git a/chrome/common/platform_util_win.cc b/chrome/common/platform_util_win.cc index 68cc839..63a4b23 100644 --- a/chrome/common/platform_util_win.cc +++ b/chrome/common/platform_util_win.cc @@ -9,10 +9,10 @@ #include <shellapi.h> #include <shlobj.h> +#include "app/gfx/native_widget_types.h" #include "app/win_util.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/gfx/native_widget_types.h" #include "base/logging.h" #include "base/registry.h" #include "base/scoped_comptr_win.h" diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h index d507882..60984d0 100644 --- a/chrome/common/plugin_messages.h +++ b/chrome/common/plugin_messages.h @@ -7,13 +7,13 @@ // // See render_message* for information about the multi-pass include of headers. -#ifndef CHROME_COMMON_PLUGIN_MESSAGES_H__ -#define CHROME_COMMON_PLUGIN_MESSAGES_H__ +#ifndef CHROME_COMMON_PLUGIN_MESSAGES_H_ +#define CHROME_COMMON_PLUGIN_MESSAGES_H_ #include <string> #include <vector> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/gfx/rect.h" #include "base/basictypes.h" #include "chrome/common/common_param_traits.h" @@ -440,4 +440,4 @@ struct ParamTraits<PluginMsg_UpdateGeometry_Param> { #define MESSAGES_INTERNAL_FILE "chrome/common/plugin_messages_internal.h" #include "ipc/ipc_message_macros.h" -#endif // CHROME_COMMON_PLUGIN_MESSAGES_H__ +#endif // CHROME_COMMON_PLUGIN_MESSAGES_H_ diff --git a/chrome/common/plugin_messages_internal.h b/chrome/common/plugin_messages_internal.h index 6301e68..cd44d21 100644 --- a/chrome/common/plugin_messages_internal.h +++ b/chrome/common/plugin_messages_internal.h @@ -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 "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/shared_memory.h" #include "build/build_config.h" #include "ipc/ipc_message_macros.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 59dc1ac..3b49083 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -10,8 +10,8 @@ #include <map> #include "app/clipboard/clipboard.h" +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/ref_counted.h" #include "base/shared_memory.h" #include "chrome/browser/renderer_host/resource_handler.h" diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 7fff1dd..2758c95 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -13,11 +13,11 @@ #include "build/build_config.h" #include "app/clipboard/clipboard.h" +#include "app/gfx/native_widget_types.h" #include "base/file_path.h" #include "base/nullable_string16.h" #include "base/platform_file.h" #include "base/gfx/rect.h" -#include "base/gfx/native_widget_types.h" #include "base/shared_memory.h" #include "base/values.h" #include "chrome/common/css_colors.h" diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 6f186ff..2971ddd 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -19,7 +19,7 @@ #if !defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX) // For download_util::DragDownload -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" #endif diff --git a/chrome/plugin/npobject_proxy.h b/chrome/plugin/npobject_proxy.h index 08b408d..2b8966d 100644 --- a/chrome/plugin/npobject_proxy.h +++ b/chrome/plugin/npobject_proxy.h @@ -8,7 +8,7 @@ #ifndef CHROME_PLUGIN_NPOBJECT_PROXY_H_ #define CHROME_PLUGIN_NPOBJECT_PROXY_H_ -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/ref_counted.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_channel.h" diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h index cc5eb3a..fbf54c2 100644 --- a/chrome/plugin/npobject_stub.h +++ b/chrome/plugin/npobject_stub.h @@ -10,7 +10,7 @@ #include <vector> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/ref_counted.h" #include "base/weak_ptr.h" #include "googleurl/src/gurl.h" diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h index f8c3396..bf7db52 100644 --- a/chrome/plugin/plugin_channel_base.h +++ b/chrome/plugin/plugin_channel_base.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__ -#define CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__ +#ifndef CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_ +#define CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_ #include <string> +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/hash_tables.h" #include "base/message_loop.h" #include "base/ref_counted.h" @@ -119,7 +119,7 @@ class PluginChannelBase : public IPC::Channel::Listener, // in the middle of dispatching a message. bool send_unblocking_only_during_dispatch_; - DISALLOW_EVIL_CONSTRUCTORS(PluginChannelBase); + DISALLOW_COPY_AND_ASSIGN(PluginChannelBase); }; -#endif // CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__ +#endif // CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_ diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h index e60c91b..6062053 100644 --- a/chrome/renderer/render_thread.h +++ b/chrome/renderer/render_thread.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/shared_memory.h" #include "base/task.h" #include "build/build_config.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 86dab30..09fbe86 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -10,13 +10,13 @@ #include "app/gfx/color_utils.h" #include "app/gfx/favicon_size.h" +#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/field_trial.h" -#include "base/gfx/native_widget_types.h" #include "base/process_util.h" #include "base/singleton.h" #include "base/string_piece.h" diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index 3df6147..f4270cc 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -6,8 +6,9 @@ #define CHROME_RENDERER_RENDER_WIDGET_H_ #include <vector> + +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/gfx/point.h" #include "base/gfx/rect.h" #include "base/gfx/size.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 2ebe048..d67a68e 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -8,6 +8,7 @@ #include "app/gfx/blit.h" #include "app/gfx/canvas.h" +#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" @@ -16,7 +17,6 @@ #include "base/ref_counted.h" #include "base/string_util.h" #include "base/gfx/size.h" -#include "base/gfx/native_widget_types.h" #include "chrome/common/child_process_logging.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h index 8651aabf..5b2e6d9 100644 --- a/chrome/renderer/webplugin_delegate_proxy.h +++ b/chrome/renderer/webplugin_delegate_proxy.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__ -#define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__ +#ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ +#define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ #include <string> #include <vector> +#include "app/gfx/native_widget_types.h" #include "base/file_path.h" #include "base/gfx/rect.h" -#include "base/gfx/native_widget_types.h" #include "base/ref_counted.h" #include "base/weak_ptr.h" #include "chrome/common/transport_dib.h" @@ -198,7 +198,7 @@ class WebPluginDelegateProxy : // The url of the main frame hosting the plugin. GURL page_url_; - DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegateProxy); + DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy); }; #endif // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index ce3ff17..1e02cff 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -8,8 +8,8 @@ #include <string> #include "app/message_box_flags.h" +#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/native_widget_types.h" #include "base/process_util.h" #include "base/scoped_ptr.h" #include "base/time.h" diff --git a/chrome/test/automation/automation_proxy_uitest.h b/chrome/test/automation/automation_proxy_uitest.h index 7ca2662..782d7e3 100644 --- a/chrome/test/automation/automation_proxy_uitest.h +++ b/chrome/test/automation/automation_proxy_uitest.h @@ -1,13 +1,13 @@ -// 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. -#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H__ -#define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H__ +#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H_ +#define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H_ #include <string> -#include "base/gfx/native_widget_types.h" +#include "app/gfx/native_widget_types.h" #include "base/message_loop.h" #include "base/platform_thread.h" #include "base/time.h" @@ -135,4 +135,4 @@ class AutomationProxyForExternalTab : public AutomationProxy { typedef CustomAutomationProxyTest<AutomationProxyForExternalTab> ExternalTabTestType; -#endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H__ +#endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_UITEST_H_ |