diff options
| -rw-r--r-- | chrome/browser/views/browser_views.vcproj | 4 | ||||
| -rw-r--r-- | chrome/browser/views/constrained_window_impl.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/frame/aero_glass_non_client_view.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/frame/opaque_non_client_view.cc | 2 | ||||
| -rw-r--r-- | chrome/views/custom_frame_window.cc | 2 | ||||
| -rw-r--r-- | chrome/views/views.vcproj | 4 | ||||
| -rw-r--r-- | chrome/views/window_resources.h (renamed from chrome/browser/views/window_resources.h) | 0 |
7 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj index 388f844..e8a17da 100644 --- a/chrome/browser/views/browser_views.vcproj +++ b/chrome/browser/views/browser_views.vcproj @@ -825,10 +825,6 @@ RelativePath=".\user_data_dir_dialog.h" > </File> - <File - RelativePath=".\window_resources.h" - > - </File> </Files> <Globals> </Globals> diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index f50aef5..316bb6f 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -10,7 +10,6 @@ #include "chrome/browser/tab_contents.h" #include "chrome/browser/views/constrained_window_animation.h" #include "chrome/browser/views/location_bar_view.h" -#include "chrome/browser/views/window_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/toolbar_model.h" @@ -27,11 +26,12 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/client_view.h" #include "chrome/views/button.h" +#include "chrome/views/client_view.h" #include "chrome/views/focus_manager.h" #include "chrome/views/hwnd_view.h" #include "chrome/views/non_client_view.h" +#include "chrome/views/window_resources.h" #include "net/base/net_util.h" #include "chromium_strings.h" diff --git a/chrome/browser/views/frame/aero_glass_non_client_view.cc b/chrome/browser/views/frame/aero_glass_non_client_view.cc index 0ac6313..932be79 100644 --- a/chrome/browser/views/frame/aero_glass_non_client_view.cc +++ b/chrome/browser/views/frame/aero_glass_non_client_view.cc @@ -7,13 +7,13 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/views/frame/browser_view2.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/browser/views/window_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/client_view.h" #include "chrome/views/window_delegate.h" +#include "chrome/views/window_resources.h" // An enumeration of bitmap resources used by this window. enum { diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc index 9630412..930fe61 100644 --- a/chrome/browser/views/frame/opaque_non_client_view.cc +++ b/chrome/browser/views/frame/opaque_non_client_view.cc @@ -7,12 +7,12 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/views/frame/browser_view2.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/browser/views/window_resources.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/root_view.h" +#include "chrome/views/window_resources.h" #include "chromium_strings.h" #include "generated_resources.h" diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc index dbbc29d..8198284 100644 --- a/chrome/views/custom_frame_window.cc +++ b/chrome/views/custom_frame_window.cc @@ -7,7 +7,6 @@ #include "base/gfx/point.h" #include "base/gfx/size.h" #include "chrome/app/theme/theme_resources.h" -#include "chrome/browser/views/window_resources.h" #include "chrome/common/gfx/path.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" @@ -20,6 +19,7 @@ #include "chrome/views/non_client_view.h" #include "chrome/views/root_view.h" #include "chrome/views/window_delegate.h" +#include "chrome/views/window_resources.h" #include "generated_resources.h" namespace ChromeViews { diff --git a/chrome/views/views.vcproj b/chrome/views/views.vcproj index 9f73219..ecb5048 100644 --- a/chrome/views/views.vcproj +++ b/chrome/views/views.vcproj @@ -629,6 +629,10 @@ RelativePath=".\window_delegate.h" > </File> + <File + RelativePath=".\window_resources.h" + > + </File> </Files> <Globals> </Globals> diff --git a/chrome/browser/views/window_resources.h b/chrome/views/window_resources.h index 30ffe65..30ffe65 100644 --- a/chrome/browser/views/window_resources.h +++ b/chrome/views/window_resources.h |