diff options
80 files changed, 414 insertions, 431 deletions
@@ -8,7 +8,10 @@ include_rules = [ "+chrome/common/chrome_paths.h", "+chrome/common/chrome_switches.h", "+chrome/common/gtk_util.h", - + # text_elider.cc + "+chrome/common/pref_names.h", + "+chrome/common/pref_service.h", + # TODO(beng): l10n_util_unittest.cc: "+chrome/test/data/resource.h", diff --git a/app/app.vcproj b/app/app.vcproj index ad6a6eb..cb2892f 100644 --- a/app/app.vcproj +++ b/app/app.vcproj @@ -1,247 +1,263 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="app"
- ProjectGUID="{4631946D-7D5F-44BD-A5A8-504C0A7033BE}"
- RootNamespace="app"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\debug.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\release.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="gfx"
- >
- <File
- RelativePath=".\gfx\chrome_canvas.cc"
- >
- </File>
- <File
- RelativePath=".\gfx\chrome_canvas.h"
- >
- </File>
- <File
- RelativePath=".\gfx\chrome_canvas_win.cc"
- >
- </File>
- <File
- RelativePath=".\gfx\chrome_font.h"
- >
- </File>
- <File
- RelativePath=".\gfx\chrome_font_win.cc"
- >
- </File>
- <File
- RelativePath=".\gfx\favicon_size.h"
- >
- </File>
- <File
- RelativePath=".\gfx\icon_util.cc"
- >
- </File>
- <File
- RelativePath=".\gfx\icon_util.h"
- >
- </File>
- <File
- RelativePath=".\gfx\insets.h"
- >
- </File>
- <File
- RelativePath=".\gfx\path.h"
- >
- </File>
- <File
- RelativePath=".\gfx\path_win.cc"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\animation.cc"
- >
- </File>
- <File
- RelativePath=".\animation.h"
- >
- </File>
- <File
- RelativePath=".\drag_drop_types.cc"
- >
- </File>
- <File
- RelativePath=".\drag_drop_types.h"
- >
- </File>
- <File
- RelativePath=".\l10n_util.cc"
- >
- </File>
- <File
- RelativePath=".\l10n_util.h"
- >
- </File>
- <File
- RelativePath=".\l10n_util_win.cc"
- >
- </File>
- <File
- RelativePath=".\l10n_util_win.h"
- >
- </File>
- <File
- RelativePath=".\message_box_flags.h"
- >
- </File>
- <File
- RelativePath=".\os_exchange_data.cc"
- >
- </File>
- <File
- RelativePath=".\os_exchange_data.h"
- >
- </File>
- <File
- RelativePath=".\resource_bundle.cc"
- >
- </File>
- <File
- RelativePath=".\resource_bundle.h"
- >
- </File>
- <File
- RelativePath=".\resource_bundle_win.cc"
- >
- </File>
- <File
- RelativePath=".\slide_animation.cc"
- >
- </File>
- <File
- RelativePath=".\slide_animation.h"
- >
- </File>
- <File
- RelativePath=".\throb_animation.cc"
- >
- </File>
- <File
- RelativePath=".\throb_animation.h"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="app" + ProjectGUID="{4631946D-7D5F-44BD-A5A8-504C0A7033BE}" + RootNamespace="app" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="4" + InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\debug.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="4" + InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\release.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="gfx" + > + <File + RelativePath=".\gfx\chrome_canvas.cc" + > + </File> + <File + RelativePath=".\gfx\chrome_canvas.h" + > + </File> + <File + RelativePath=".\gfx\chrome_canvas_win.cc" + > + </File> + <File + RelativePath=".\gfx\chrome_font.h" + > + </File> + <File + RelativePath=".\gfx\chrome_font_win.cc" + > + </File> + <File + RelativePath=".\gfx\color_utils.cc" + > + </File> + <File + RelativePath=".\gfx\color_utils.h" + > + </File> + <File + RelativePath=".\gfx\favicon_size.h" + > + </File> + <File + RelativePath=".\gfx\icon_util.cc" + > + </File> + <File + RelativePath=".\gfx\icon_util.h" + > + </File> + <File + RelativePath=".\gfx\insets.h" + > + </File> + <File + RelativePath=".\gfx\path.h" + > + </File> + <File + RelativePath=".\gfx\path_win.cc" + > + </File> + <File + RelativePath=".\gfx\text_elider.cc" + > + </File> + <File + RelativePath=".\gfx\text_elider.h" + > + </File> + </Filter> + <File + RelativePath=".\animation.cc" + > + </File> + <File + RelativePath=".\animation.h" + > + </File> + <File + RelativePath=".\drag_drop_types.cc" + > + </File> + <File + RelativePath=".\drag_drop_types.h" + > + </File> + <File + RelativePath=".\l10n_util.cc" + > + </File> + <File + RelativePath=".\l10n_util.h" + > + </File> + <File + RelativePath=".\l10n_util_win.cc" + > + </File> + <File + RelativePath=".\l10n_util_win.h" + > + </File> + <File + RelativePath=".\message_box_flags.h" + > + </File> + <File + RelativePath=".\os_exchange_data.cc" + > + </File> + <File + RelativePath=".\os_exchange_data.h" + > + </File> + <File + RelativePath=".\resource_bundle.cc" + > + </File> + <File + RelativePath=".\resource_bundle.h" + > + </File> + <File + RelativePath=".\resource_bundle_win.cc" + > + </File> + <File + RelativePath=".\slide_animation.cc" + > + </File> + <File + RelativePath=".\slide_animation.h" + > + </File> + <File + RelativePath=".\throb_animation.cc" + > + </File> + <File + RelativePath=".\throb_animation.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/chrome/common/gfx/color_utils.cc b/app/gfx/color_utils.cc index 70437e1..6378723 100644 --- a/chrome/common/gfx/color_utils.cc +++ b/app/gfx/color_utils.cc @@ -2,22 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "build/build_config.h" +#include "app/gfx/color_utils.h" #include <math.h> #if defined(OS_WIN) #include <windows.h> #endif -#include "chrome/common/gfx/color_utils.h" - #include "base/basictypes.h" #include "base/logging.h" -#include "skia/include/SkBitmap.h" - +#include "build/build_config.h" #if defined(OS_WIN) #include "skia/ext/skia_utils_win.h" #endif +#include "skia/include/SkBitmap.h" namespace color_utils { diff --git a/chrome/common/gfx/color_utils.h b/app/gfx/color_utils.h index cdf7659..706361d 100644 --- a/chrome/common/gfx/color_utils.h +++ b/app/gfx/color_utils.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_GFX_COLOR_UTILS_H__ -#define CHROME_COMMON_GFX_COLOR_UTILS_H__ +#ifndef APP_GFX_COLOR_UTILS_H_ +#define APP_GFX_COLOR_UTILS_H_ -#include "SkColor.h" +#include "skia/include/SkColor.h" class SkBitmap; @@ -60,4 +60,4 @@ SkColor GetSysSkColor(int which); } // namespace color_utils -#endif // #ifndef CHROME_COMMON_GFX_COLOR_UTILS_H__ +#endif // #ifndef APP_GFX_COLOR_UTILS_H_ diff --git a/chrome/common/gfx/text_elider.cc b/app/gfx/text_elider.cc index 1b0303f..527f804 100644 --- a/chrome/common/gfx/text_elider.cc +++ b/app/gfx/text_elider.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "app/gfx/chrome_font.h" +#include "app/gfx/text_elider.h" #include "base/file_path.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/gfx/text_elider.h b/app/gfx/text_elider.h index 61bfada..61bfada 100644 --- a/chrome/common/gfx/text_elider.h +++ b/app/gfx/text_elider.h diff --git a/chrome/common/gfx/text_elider_unittest.cc b/app/gfx/text_elider_unittest.cc index 3a2eb6d..0f17f9f 100644 --- a/chrome/common/gfx/text_elider_unittest.cc +++ b/app/gfx/text_elider_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "app/gfx/chrome_font.h" +#include "app/gfx/text_elider.h" #include "base/file_path.h" #include "base/string_util.h" -#include "chrome/common/gfx/text_elider.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index decdd78..4b9db4e 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "base/basictypes.h" #include "base/string_util.h" @@ -18,7 +19,6 @@ #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 8bf5b83..7a2ce8b 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -26,7 +26,6 @@ #include "chrome/browser/autocomplete/keyword_provider.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/drag_utils.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" @@ -40,6 +39,7 @@ #include "googleurl/src/url_util.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" +#include "views/drag_utils.h" #include "views/focus/focus_util_win.h" #pragma comment(lib, "oleacc.lib") // Needed for accessibility support. diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index e1b71a9..d623748 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/text_elider.h" #include "base/basictypes.h" #include "base/histogram.h" #include "base/message_loop.h" @@ -15,7 +16,6 @@ #include "chrome/browser/history/history_database.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/sqlite_utils.h" diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index 0dfa68d..91e7a36 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -1291,18 +1291,6 @@ </File> </Filter> <Filter - Name="Drag & Drop" - > - <File - RelativePath=".\drag_utils.cc" - > - </File> - <File - RelativePath=".\drag_utils.h" - > - </File> - </Filter> - <Filter Name="Tabs" > <File diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc index 865635f..fbb1237 100644 --- a/chrome/browser/debugger/debugger_view.cc +++ b/chrome/browser/debugger/debugger_view.cc @@ -19,7 +19,6 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/view_ids.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/common/url_constants.h" #include "grit/debugger_resources.h" @@ -27,6 +26,7 @@ #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/controls/scroll_view.h" #include "views/controls/text_field.h" +#include "views/standard_layout.h" #include "views/view.h" DebuggerView::DebuggerView(DebuggerWindow* window) diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 74a5d85..6fefb6e 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -19,13 +19,13 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" -#include "chrome/browser/drag_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" #include "skia/include/SkPath.h" #include "skia/include/SkShader.h" +#include "views/drag_utils.h" #include "views/view.h" namespace download_util { diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index ada9183..ebfe567 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/bookmark_bar_gtk.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/gtk_util.h" @@ -15,7 +16,6 @@ #include "chrome/browser/gtk/gtk_chrome_button.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/gtk_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc index 4a89aa8..42699e4 100644 --- a/chrome/browser/gtk/download_item_gtk.cc +++ b/chrome/browser/gtk/download_item_gtk.cc @@ -5,6 +5,7 @@ #include "chrome/browser/gtk/download_item_gtk.h" #include "app/gfx/chrome_font.h" +#include "app/gfx/text_elider.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/string_util.h" @@ -14,7 +15,6 @@ #include "chrome/browser/gtk/download_shelf_gtk.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/gtk/nine_box.h" -#include "chrome/common/gfx/text_elider.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/input_window_dialog_win.cc b/chrome/browser/input_window_dialog_win.cc index 73f10a3..d236cc9 100644 --- a/chrome/browser/input_window_dialog_win.cc +++ b/chrome/browser/input_window_dialog_win.cc @@ -7,10 +7,10 @@ #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/task.h" -#include "chrome/browser/views/standard_layout.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/text_field.h" +#include "views/standard_layout.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/jsmessage_box_handler.cc b/chrome/browser/jsmessage_box_handler.cc index 061e469..7de44e8 100644 --- a/chrome/browser/jsmessage_box_handler.cc +++ b/chrome/browser/jsmessage_box_handler.cc @@ -4,6 +4,7 @@ #include "chrome/browser/jsmessage_box_handler.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" #include "build/build_config.h" @@ -11,7 +12,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index edccfa0..4162061 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <algorithm> - #include "chrome/browser/net/url_fixer_upper.h" +#include <algorithm> + +#include "app/gfx/text_elider.h" #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_file.h" diff --git a/chrome/browser/printing/page_overlays.cc b/chrome/browser/printing/page_overlays.cc index 4a20dd6..6233d84 100644 --- a/chrome/browser/printing/page_overlays.cc +++ b/chrome/browser/printing/page_overlays.cc @@ -4,11 +4,11 @@ #include "chrome/browser/printing/page_overlays.h" +#include "app/gfx/text_elider.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/printing/printed_document.h" #include "chrome/browser/printing/printed_page.h" -#include "chrome/common/gfx/text_elider.h" namespace { diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc index 902554b..c408513 100644 --- a/chrome/browser/printing/printed_document.cc +++ b/chrome/browser/printing/printed_document.cc @@ -7,6 +7,7 @@ #include <set> #include "app/gfx/chrome_font.h" +#include "app/gfx/text_elider.h" #include "base/message_loop.h" #include "base/time.h" #include "chrome/browser/printing/page_number.h" @@ -14,7 +15,6 @@ #include "chrome/browser/printing/printed_pages_source.h" #include "chrome/browser/printing/printed_page.h" #include "chrome/common/gfx/emf.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/time_format.h" #include "chrome/common/notification_service.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc index 874f9fc..2b6e20f 100644 --- a/chrome/browser/tab_contents/navigation_entry.cc +++ b/chrome/browser/tab_contents/navigation_entry.cc @@ -4,9 +4,9 @@ #include "chrome/browser/tab_contents/navigation_entry.h" +#include "app/gfx/text_elider.h" #include "app/resource_bundle.h" #include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index b48f304..90b0ee8 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -15,7 +15,6 @@ #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/task_manager_resource_providers.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" @@ -28,6 +27,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/link.h" #include "views/controls/menu/menu.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc index ec6be7c..b091fc8 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/toolbar_model.cc @@ -4,13 +4,13 @@ #include "chrome/browser/toolbar_model.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index faa8744..cc4e294 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -7,6 +7,7 @@ #include <commdlg.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" @@ -14,10 +15,8 @@ #include "base/win_util.h" #include "base/word_iterator.h" #include "chrome/browser/browser_list.h" -#include "chrome/common/gfx/color_utils.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/restart_message_box.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/install_util.h" #include "grit/chromium_strings.h" @@ -26,6 +25,7 @@ #include "grit/theme_resources.h" #include "views/controls/text_field.h" #include "views/controls/throbber.h" +#include "views/standard_layout.h" #include "views/window/window.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc index 9d11334..27987b1 100644 --- a/chrome/browser/views/about_ipc_dialog.cc +++ b/chrome/browser/views/about_ipc_dialog.cc @@ -20,7 +20,6 @@ #include "base/time.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/plugin_messages.h" @@ -31,6 +30,7 @@ #include "views/grid_layout.h" #include "views/controls/button/text_button.h" #include "views/controls/hwnd_view.h" +#include "views/standard_layout.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc index aced9e3..74235ba 100644 --- a/chrome/browser/views/about_network_dialog.cc +++ b/chrome/browser/views/about_network_dialog.cc @@ -7,13 +7,13 @@ #include "base/string_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/views/standard_layout.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_tracker.h" #include "views/grid_layout.h" #include "views/controls/button/text_button.h" #include "views/controls/text_field.h" +#include "views/standard_layout.h" #include "views/window/window.h" namespace { diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index a6c9366..2dddc6f 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -7,6 +7,7 @@ #include <dwmapi.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/color_utils.h" #include "app/gfx/insets.h" #include "app/gfx/path.h" #include "app/l10n_util.h" @@ -14,7 +15,6 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" -#include "chrome/common/gfx/color_utils.h" #include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index d54e5ff..5604db7 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -7,6 +7,7 @@ #include <limits> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" @@ -15,7 +16,6 @@ #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" -#include "chrome/browser/drag_utils.h" #include "chrome/browser/extensions/extension.h" #include "chrome/browser/extensions/extension_view.h" #include "chrome/browser/extensions/extensions_service.h" @@ -27,7 +27,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/event_utils.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" @@ -38,6 +37,7 @@ #include "skia/ext/skia_utils.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/chrome_menu.h" +#include "views/drag_utils.h" #include "views/view_constants.h" #include "views/widget/tooltip_manager.h" #include "views/widget/widget.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index abae95f..e24665c 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -14,10 +14,10 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/info_bubble.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "views/standard_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/text_field.h" diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index 40472cb..692f72d 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -12,7 +12,6 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/views/standard_layout.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -22,6 +21,7 @@ #include "views/grid_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index ec28029..41df839 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/color_utils.h" #include "base/thread.h" #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" #include "chrome/browser/bookmarks/bookmark_html_writer.h" @@ -21,8 +22,6 @@ #include "chrome/browser/views/bookmark_editor_view.h" #include "chrome/browser/views/bookmark_folder_tree_view.h" #include "chrome/browser/views/bookmark_table_view.h" -#include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/color_utils.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" @@ -33,6 +32,7 @@ #include "views/controls/button/menu_button.h" #include "views/controls/label.h" #include "views/controls/single_split_view.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj index 1fc5c21..3a79320 100644 --- a/chrome/browser/views/browser_views.vcproj +++ b/chrome/browser/views/browser_views.vcproj @@ -786,10 +786,6 @@ > </File> <File - RelativePath=".\standard_layout.h" - > - </File> - <File RelativePath=".\star_toggle.cc" > </File> diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index 7bebdc5..3af66f4 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -15,7 +15,6 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" @@ -26,6 +25,7 @@ #include "views/controls/button/checkbox.h" #include "views/controls/label.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/window/client_view.h" #include "views/window/window.h" diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index 6502cd4..1b4f517 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -7,7 +7,6 @@ #include "app/l10n_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" @@ -17,6 +16,7 @@ #include "views/controls/button/checkbox.h" #include "views/controls/label.h" #include "views/controls/throbber.h" +#include "views/standard_layout.h" #include "views/window/window.h" using base::Time; diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 142a983..ca4f35c 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -7,6 +7,7 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" #include "app/gfx/path.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/rect.h" @@ -20,7 +21,6 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 4f1d349..aa74f2fa1 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -7,6 +7,7 @@ #include <vector> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_path.h" @@ -15,7 +16,6 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index c18e94f..2774379 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -13,7 +13,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/keyword_editor_view.h" -#include "chrome/browser/views/standard_layout.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -21,6 +20,7 @@ #include "views/controls/image_view.h" #include "views/controls/table/table_view.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/window/window.h" using views::GridLayout; diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 61bcdb2..552bb44 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -13,7 +13,6 @@ #include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -21,6 +20,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/focus/focus_manager.h" +#include "views/standard_layout.h" #include "views/window/window.h" namespace { diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index 1ac1eb7..7a378ef 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -9,7 +9,6 @@ #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -19,6 +18,7 @@ #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/throbber.h" +#include "views/standard_layout.h" #include "views/window/window.h" FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile, diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index 866b114..bd172f1 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -10,7 +10,6 @@ #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/first_run_customize_view.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -20,6 +19,7 @@ #include "views/controls/label.h" #include "views/controls/throbber.h" #include "views/controls/separator.h" +#include "views/standard_layout.h" #include "views/window/window.h" namespace { diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index 5a3788a..afb73f0 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -14,7 +14,6 @@ #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/shell_integration.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -27,6 +26,7 @@ #include "views/controls/label.h" #include "views/controls/throbber.h" #include "views/controls/separator.h" +#include "views/standard_layout.h" #include "views/window/client_view.h" #include "views/window/window.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index ae0ac20..20c7e06 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -9,7 +9,6 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/logging_chrome.h" @@ -22,6 +21,7 @@ #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/table/group_table_view.h" +#include "views/standard_layout.h" #include "views/window/client_view.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc index e2fc249..3d58b33 100644 --- a/chrome/browser/views/importer_lock_view.cc +++ b/chrome/browser/views/importer_lock_view.cc @@ -6,11 +6,11 @@ #include "app/l10n_util.h" #include "chrome/browser/importer/importer.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/label.h" +#include "views/standard_layout.h" #include "views/window/window.h" using views::ColumnSet; diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc index 7f03c3b..4bee708 100644 --- a/chrome/browser/views/importer_view.cc +++ b/chrome/browser/views/importer_view.cc @@ -6,12 +6,12 @@ #include "app/l10n_util.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/window/window.h" using views::ColumnSet; diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index 2c917d2..8ed9bf8 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -5,13 +5,13 @@ #include "chrome/browser/views/importing_progress_view.h" #include "app/l10n_util.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/throbber.h" +#include "views/standard_layout.h" #include "views/window/window.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index bfb90dc..4dd4296 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -17,7 +17,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/edit_keyword_controller.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" @@ -29,6 +28,7 @@ #include "views/grid_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/text_field.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc index 150e447..cab7ba2 100644 --- a/chrome/browser/views/login_view.cc +++ b/chrome/browser/views/login_view.cc @@ -8,11 +8,11 @@ #include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/text_field.h" +#include "views/standard_layout.h" #include "views/widget/root_view.h" namespace views { diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index aed2aea..3bbf9a6 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -28,7 +28,6 @@ #include "chrome/browser/views/options/cookies_view.h" #include "chrome/browser/views/options/language_combobox_model.h" #include "chrome/browser/views/restart_message_box.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/filter_policy.h" #include "chrome/common/pref_member.h" #include "chrome/common/pref_names.h" @@ -43,6 +42,7 @@ #include "views/controls/combo_box.h" #include "views/controls/scroll_view.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" using views::GridLayout; diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index ac0fed1..c20ecad 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -10,7 +10,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/views/options/advanced_contents_view.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -21,6 +20,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/scroll_view.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 955ea3e..6e3aff2 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -19,7 +19,6 @@ #include "chrome/browser/views/options/fonts_languages_window_view.h" #include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/options/passwords_exceptions_window_view.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" @@ -29,6 +28,7 @@ #include "views/controls/button/radio_button.h" #include "views/controls/text_field.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index 012e6ab..2b5ab0f 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -7,13 +7,12 @@ #include "chrome/browser/views/options/cookies_view.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/color_utils.h" #include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -26,6 +25,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/text_field.h" #include "views/controls/table/table_view.h" +#include "views/standard_layout.h" // static views::Window* CookiesView::instance_ = NULL; diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc index 6492640..daff30e 100644 --- a/chrome/browser/views/options/exceptions_page_view.cc +++ b/chrome/browser/views/options/exceptions_page_view.cc @@ -7,13 +7,13 @@ #include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" #include "views/background.h" #include "views/controls/button/native_button.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 7e497c0..d9256ea 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -21,7 +21,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" @@ -31,6 +30,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/text_field.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 505d85a..2726b83 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -23,7 +23,6 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/options/options_group_view.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" @@ -38,6 +37,7 @@ #include "views/controls/table/table_view.h" #include "views/controls/text_field.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" namespace { diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index c3b6a29..06d2ad1 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -21,7 +21,6 @@ #include "chrome/browser/spellchecker.h" #include "chrome/browser/views/options/language_combobox_model.h" #include "chrome/browser/views/restart_message_box.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" @@ -34,6 +33,7 @@ #include "views/controls/tabbed_pane.h" #include "views/controls/text_field.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index fa7d3cd..91a617f 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -12,12 +12,12 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/separator.h" +#include "views/standard_layout.h" static const int kLeftColumnWidthChars = 20; static const int kOptionsGroupViewColumnSpacing = 30; diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc index f7f02cd..77c02ad 100644 --- a/chrome/browser/views/options/passwords_page_view.cc +++ b/chrome/browser/views/options/passwords_page_view.cc @@ -7,13 +7,13 @@ #include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" #include "views/background.h" #include "views/controls/button/native_button.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h index a7a30b5..2fd9e46 100644 --- a/chrome/browser/views/options/passwords_page_view.h +++ b/chrome/browser/views/options/passwords_page_view.h @@ -7,11 +7,11 @@ #include <vector> +#include "app/gfx/text_elider.h" #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "chrome/browser/views/options/options_page_view.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/common/gfx/text_elider.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index ad37f7b..7f73092 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -16,7 +16,6 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/ssl/ssl_manager.h" -#include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" @@ -32,6 +31,7 @@ #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/separator.h" +#include "views/standard_layout.h" using base::Time; diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc index 074fec6..ff9c0a3 100644 --- a/chrome/browser/views/select_profile_dialog.cc +++ b/chrome/browser/views/select_profile_dialog.cc @@ -11,7 +11,6 @@ #include "base/string_util.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/views/new_profile_dialog.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -19,6 +18,7 @@ #include "views/controls/label.h" #include "views/controls/message_box_view.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/view.h" #include "views/window/window.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index 70c4e71..b609ad4 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/shelf_item_dialog.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/png_decoder.h" @@ -12,8 +13,6 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" @@ -25,6 +24,7 @@ #include "views/controls/text_field.h" #include "views/focus/focus_manager.h" #include "views/grid_layout.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" using base::Time; diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index d44c967..6468c7a 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -7,12 +7,12 @@ #include <algorithm> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/animation.h" #include "app/resource_bundle.h" #include "base/string_util.h" -#include "chrome/common/gfx/text_elider.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index f4657eb..38cc412 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -19,7 +19,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" -#include "chrome/browser/drag_utils.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/navigation_controller.h" @@ -50,6 +49,7 @@ #include "views/controls/button/button_dropdown.h" #include "views/controls/hwnd_view.h" #include "views/controls/label.h" +#include "views/drag_utils.h" #include "views/widget/tooltip_manager.h" #include "views/window/non_client_view.h" #include "views/window/window.h" @@ -829,7 +829,8 @@ void BrowserToolbarView::WriteDragData(views::View* sender, drag_utils::SetURLAndDragImage(tab_->GetURL(), UTF16ToWideHack(tab_->GetTitle()), - tab_->GetFavIcon(), data); + tab_->GetFavIcon(), + data); } TabContents* BrowserToolbarView::GetTabContents() { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 06ade17..de01a3e 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -141,6 +141,8 @@ '../app/gfx/chrome_font_mac.mm', '../app/gfx/chrome_font_skia.cc', '../app/gfx/chrome_font_win.cc', + '../app/gfx/color_utils.cc', + '../app/gfx/color_utils.h', '../app/gfx/favicon_size.h', '../app/gfx/icon_util.cc', '../app/gfx/icon_util.h', @@ -148,6 +150,8 @@ '../app/gfx/path_gtk.cc', '../app/gfx/path_win.cc', '../app/gfx/path.h', + '../app/gfx/text_elider.cc', + '../app/gfx/text_elider.h', '../app/l10n_util.cc', '../app/l10n_util.h', '../app/l10n_util_posix.cc', @@ -254,12 +258,8 @@ 'common/extensions/url_pattern.h', 'common/extensions/user_script.cc', 'common/extensions/user_script.h', - 'common/gfx/color_utils.cc', - 'common/gfx/color_utils.h', 'common/gfx/emf.cc', 'common/gfx/emf.h', - 'common/gfx/text_elider.cc', - 'common/gfx/text_elider.h', 'common/gfx/utils.h', 'common/gtk_util.cc', 'common/gtk_util.h', @@ -268,7 +268,6 @@ 'common/net/dns.h', 'common/net/url_request_intercept_job.cc', 'common/net/url_request_intercept_job.h', - 'common/accessibility_types.h', 'common/app_cache/app_cache_context_impl.cc', 'common/app_cache/app_cache_context_impl.h', 'common/app_cache/app_cache_dispatcher.cc', @@ -1422,7 +1421,6 @@ 'browser/views/shelf_item_dialog.cc', 'browser/views/shelf_item_dialog.h', 'browser/views/shell_dialogs_win.cc', - 'browser/views/standard_layout.h', 'browser/views/star_toggle.cc', 'browser/views/star_toggle.h', 'browser/views/status_bubble_views.cc', @@ -2617,7 +2615,7 @@ '../app/gfx/chrome_font_unittest.cc', 'common/gfx/emf_unittest.cc', '../app/gfx/icon_util_unittest.cc', - 'common/gfx/text_elider_unittest.cc', + '../app/gfx/text_elider_unittest.cc', 'common/important_file_writer_unittest.cc', 'common/ipc_message_unittest.cc', 'common/ipc_sync_channel_unittest.cc', @@ -2980,6 +2978,7 @@ # All .cc, .h under views, except unittests '../views/accelerator.cc', '../views/accelerator.h', + '../views/accessibility/accessibility_types.h', '../views/accessibility/view_accessibility.cc', '../views/accessibility/view_accessibility.h', '../views/accessibility/view_accessibility_wrapper.cc', @@ -3082,6 +3081,7 @@ '../views/painter.h', '../views/repeat_controller.cc', '../views/repeat_controller.h', + '../views/standard_layout.h', '../views/view.cc', '../views/view.h', '../views/view_constants.cc', diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index 4c2d021..5c6c28f 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -149,14 +149,6 @@ Name="gfx" > <File - RelativePath=".\gfx\color_utils.cc" - > - </File> - <File - RelativePath=".\gfx\color_utils.h" - > - </File> - <File RelativePath=".\gfx\emf.cc" > </File> @@ -165,14 +157,6 @@ > </File> <File - RelativePath=".\gfx\text_elider.cc" - > - </File> - <File - RelativePath=".\gfx\text_elider.h" - > - </File> - <File RelativePath=".\gfx\utils.h" > </File> @@ -314,10 +298,6 @@ </File> </Filter> <File - RelativePath=".\accessibility_types.h" - > - </File> - <File RelativePath=".\bindings_policy.h" > </File> diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 2c46555..2b3c250 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "app/gfx/color_utils.h" #include "app/gfx/favicon_size.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" @@ -21,7 +22,6 @@ #include "build/build_config.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/gfx/color_utils.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/page_zoom.h" #include "chrome/common/render_messages.h" diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 7b0a8ed..0904a9b 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -1016,10 +1016,6 @@ > </File> <File - RelativePath="..\..\common\gfx\text_elider_unittest.cc" - > - </File> - <File RelativePath="..\..\common\time_format_unittest.cc" > </File> @@ -1111,6 +1107,10 @@ RelativePath="..\..\..\app\os_exchange_data_unittest.cc" > </File> + <File + RelativePath="..\..\..\app\gfx\text_elider_unittest.cc" + > + </File> </Filter> </Files> <Globals> @@ -1,37 +1,24 @@ -include_rules = [
- "+app",
- "+skia/ext",
- "+skia/include",
-
- # TODO(beng): sever these dependencies into chrome by either refactoring or
- # moving code into app/
-
- # view.h
- "+chrome/common/accessibility_types.h",
-
- # view_unittest.cc
- "+chrome/browser/browser_process.h",
-
- # label.cc
- "+chrome/common/gfx/text_elider.h",
-
- # message_box_view.cc
- "+chrome/browser/views/standard_layout.h",
-
- # text_field.cc
- "+chrome/common/win_util.h",
-
- # widget_win.cc
- "+chrome/app/chrome_dll_resource.h",
-
- # window_delegate.cc
- "+chrome/common/pref_service.h",
-
- # chrome_menu.cc
- "+chrome/browser/drag_utils.h",
- "+chrome/common/gfx/color_utils.h",
-
- # TODO(beng): swap these with app/views specific generated resources.
- "+grit/generated_resources.h",
- "+grit/theme_resources.h",
-]
+include_rules = [ + "+app", + "+skia/ext", + "+skia/include", + + # TODO(beng): sever these dependencies into chrome by either refactoring or + # moving code into app/ + + # message_box_view.cc, text_field.cc, window_delegate.cc + "+chrome/browser/browser_process.h", + + # text_field.cc + "+chrome/common/win_util.h", + + # widget_win.cc + "+chrome/app/chrome_dll_resource.h", + + # window_delegate.cc + "+chrome/common/pref_service.h", + + # TODO(beng): swap these with app/views specific generated resources. + "+grit/generated_resources.h", + "+grit/theme_resources.h", +] diff --git a/chrome/common/accessibility_types.h b/views/accessibility/accessibility_types.h index b1e6e2e..32e4f73 100644 --- a/chrome/common/accessibility_types.h +++ b/views/accessibility/accessibility_types.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 CHROME_COMMON_ACCESSIBILITY_TYPES_H_ -#define CHROME_COMMON_ACCESSIBILITY_TYPES_H_ +#ifndef VIEWS_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_ +#define VIEWS_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_ //////////////////////////////////////////////////////////////////////////////// // @@ -45,4 +45,4 @@ class AccessibilityTypes { ~AccessibilityTypes() {} }; -#endif // CHROME_COMMON_ACCESSIBILITY_TYPES_H_ +#endif // VIEWS_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_ diff --git a/views/accessibility/view_accessibility.h b/views/accessibility/view_accessibility.h index 840a685..bc1c26f 100644 --- a/views/accessibility/view_accessibility.h +++ b/views/accessibility/view_accessibility.h @@ -127,12 +127,12 @@ class ATL_NO_VTABLE ViewAccessibility // Helper function which sets applicable states of view. void SetState(VARIANT* msaa_state, views::View* view); - // Returns a conversion from the Role (as defined in - // chrome/common/accessibility_types.h) to an MSAA role. + // Returns a conversion from the Role (as defined in accessibility_types.h) + // to an MSAA role. long MSAARole(AccessibilityTypes::Role role); - // Returns a conversion from the State (as defined in - // chrome/common/accessibility_types.h) to MSAA states set. + // Returns a conversion from the State (as defined in accessibility_types.h) + // to MSAA states set. long MSAAState(AccessibilityTypes::State state); // Member View needed for view-specific calls. diff --git a/views/controls/label.cc b/views/controls/label.cc index 1dc0b54..ceb9fa1 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -9,11 +9,11 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" #include "app/gfx/insets.h" +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/gfx/text_elider.h" #include "views/background.h" namespace views { diff --git a/views/controls/menu/chrome_menu.cc b/views/controls/menu/chrome_menu.cc index a887fd5..203fb88 100644 --- a/views/controls/menu/chrome_menu.cc +++ b/views/controls/menu/chrome_menu.cc @@ -9,6 +9,7 @@ #include <Vssym32.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/os_exchange_data.h" @@ -18,12 +19,10 @@ #include "base/task.h" #include "base/timer.h" #include "base/win_util.h" -// TODO(beng): (Cleanup) remove this browser dep. -#include "chrome/browser/drag_utils.h" -#include "chrome/common/gfx/color_utils.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" #include "views/border.h" +#include "views/drag_utils.h" #include "views/view_constants.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index d9c45c2..456bb6e 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -11,10 +11,10 @@ #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/views/standard_layout.h" +#include "grit/generated_resources.h" #include "views/controls/button/checkbox.h" +#include "views/standard_layout.h" #include "views/window/client_view.h" -#include "grit/generated_resources.h" static const int kDefaultMessageWidth = 320; diff --git a/chrome/browser/drag_utils.cc b/views/drag_utils.cc index e40e1d0..271e683 100644 --- a/chrome/browser/drag_utils.cc +++ b/views/drag_utils.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 "chrome/browser/drag_utils.h" +#include "views/drag_utils.h" #include <objidl.h> #include <shlobj.h> @@ -17,7 +17,6 @@ #include "base/gfx/gdi_util.h" #include "base/gfx/point.h" #include "base/string_util.h" -#include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/common/win_util.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" @@ -93,7 +92,7 @@ void SetURLAndDragImage(const GURL& url, // Create a button to render the drag image for us. views::TextButton button(NULL, title.empty() ? UTF8ToWide(url.spec()) : title); - button.set_max_width(BookmarkBarView::kMaxButtonWidth); + button.set_max_width(kLinkDragImageMaxWidth); if (icon.isNull()) { button.SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed( IDR_DEFAULT_FAVICON)); diff --git a/chrome/browser/drag_utils.h b/views/drag_utils.h index a1f4b70..22855cfa 100644 --- a/chrome/browser/drag_utils.h +++ b/views/drag_utils.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 CHROME_BROWSER_DRAG_UTILS_H__ -#define CHROME_BROWSER_DRAG_UTILS_H__ +#ifndef VIEWS_DRAG_UTILS_H_ +#define VIEWS_DRAG_UTILS_H_ #include <objidl.h> #include <string> @@ -42,4 +42,4 @@ void SetDragImageOnDataObject(const ChromeCanvas& canvas, } // namespace drag_utils -#endif // #ifndef CHROME_BROWSER_DRAG_UTILS_H__ +#endif // #ifndef VIEWS_DRAG_UTILS_H_ diff --git a/chrome/browser/views/standard_layout.h b/views/standard_layout.h index d72c7f3..a96fe44 100644 --- a/chrome/browser/views/standard_layout.h +++ b/views/standard_layout.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 CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__ -#define CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__ +#ifndef VIEWS_STANDARD_LAYOUT_H_ +#define VIEWS_STANDARD_LAYOUT_H_ #include "views/grid_layout.h" @@ -74,4 +74,4 @@ static views::GridLayout* CreatePanelGridLayout(views::View* host) { return layout; } -#endif // CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__ +#endif // VIEWS_STANDARD_LAYOUT_H_ diff --git a/views/view.h b/views/view.h index e004e03..e3a78f7 100644 --- a/views/view.h +++ b/views/view.h @@ -20,8 +20,8 @@ #include "base/gfx/rect.h" #include "base/scoped_ptr.h" -#include "chrome/common/accessibility_types.h" #include "views/accelerator.h" +#include "views/accessibility/accessibility_types.h" #include "views/background.h" #include "views/border.h" diff --git a/views/views.vcproj b/views/views.vcproj index c10e68d..2c98260 100644 --- a/views/views.vcproj +++ b/views/views.vcproj @@ -125,6 +125,10 @@ Name="accessibility" > <File + RelativePath=".\accessibility\accessibility_types.h" + > + </File> + <File RelativePath=".\accessibility\view_accessibility.cc" > </File> @@ -776,6 +780,14 @@ > </File> <File + RelativePath=".\drag_utils.cc" + > + </File> + <File + RelativePath=".\drag_utils.h" + > + </File> + <File RelativePath=".\event.cc" > </File> @@ -844,6 +856,10 @@ > </File> <File + RelativePath=".\standard_layout.h" + > + </File> + <File RelativePath=".\view.cc" > </File> diff --git a/views/widget/tooltip_manager.cc b/views/widget/tooltip_manager.cc index 18faf4a..114a032 100644 --- a/views/widget/tooltip_manager.cc +++ b/views/widget/tooltip_manager.cc @@ -6,11 +6,11 @@ #include <limits> +#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/logging.h" #include "base/message_loop.h" -#include "chrome/common/gfx/text_elider.h" #include "chrome/common/win_util.h" #include "views/view.h" #include "views/widget/root_view.h" diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index b7989ac..17fc332 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -13,9 +13,9 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" -#include "chrome/browser/views/standard_layout.h" #include "grit/generated_resources.h" #include "views/controls/button/native_button.h" +#include "views/standard_layout.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" |