diff options
author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 01:53:38 +0000 |
---|---|---|
committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 01:53:38 +0000 |
commit | 08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8 (patch) | |
tree | f961683ebee575109805b3d465032057f4b01fe5 /ui | |
parent | b87b12e002f8c21806b4848be90c5e563bf5337d (diff) | |
download | chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.zip chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.tar.gz chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.tar.bz2 |
Change includes of gfx/* to ui/gfx/*
BUG=71063
TEST=compiled
Review URL: http://codereview.chromium.org/6312156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
105 files changed, 169 insertions, 169 deletions
diff --git a/ui/base/animation/animation.cc b/ui/base/animation/animation.cc index 1824774..78ee4d9 100644 --- a/ui/base/animation/animation.cc +++ b/ui/base/animation/animation.cc @@ -4,10 +4,10 @@ #include "ui/base/animation/animation.h" -#include "gfx/rect.h" #include "ui/base/animation/animation_container.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/tween.h" +#include "ui/gfx/rect.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/ui/base/animation/tween.cc b/ui/base/animation/tween.cc index 131e686..515ae57 100644 --- a/ui/base/animation/tween.cc +++ b/ui/base/animation/tween.cc @@ -11,7 +11,7 @@ #endif #include "base/logging.h" -#include "gfx/rect.h" +#include "ui/gfx/rect.h" namespace ui { diff --git a/ui/base/clipboard/clipboard.cc b/ui/base/clipboard/clipboard.cc index 4b9bf603..cfd14f8 100644 --- a/ui/base/clipboard/clipboard.cc +++ b/ui/base/clipboard/clipboard.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" -#include "gfx/size.h" +#include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_linux.cc b/ui/base/clipboard/clipboard_linux.cc index da24c4f..f9ec174 100644 --- a/ui/base/clipboard/clipboard_linux.cc +++ b/ui/base/clipboard/clipboard_linux.cc @@ -14,8 +14,8 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" -#include "gfx/gtk_util.h" -#include "gfx/size.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm index fb62346..89ad97d 100644 --- a/ui/base/clipboard/clipboard_mac.mm +++ b/ui/base/clipboard/clipboard_mac.mm @@ -13,8 +13,8 @@ #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "gfx/size.h" #import "third_party/mozilla/NSPasteboard+Utils.h" +#include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc index 866db6c..e8c6983 100644 --- a/ui/base/clipboard/clipboard_unittest.cc +++ b/ui/base/clipboard/clipboard_unittest.cc @@ -10,11 +10,11 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "gfx/size.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" +#include "ui/gfx/size.h" #if defined(OS_WIN) #include "base/message_loop.h" diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index 7c21dcf..88a1ff5 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -17,8 +17,8 @@ #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "gfx/size.h" #include "ui/base/clipboard/clipboard_util_win.h" +#include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc index 43ffaad..42ca835 100644 --- a/ui/base/clipboard/scoped_clipboard_writer.cc +++ b/ui/base/clipboard/scoped_clipboard_writer.cc @@ -10,7 +10,7 @@ #include "base/pickle.h" #include "base/utf_string_conversions.h" -#include "gfx/size.h" +#include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/dragdrop/os_exchange_data_provider_gtk.h b/ui/base/dragdrop/os_exchange_data_provider_gtk.h index 2025b98..e87acac 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_gtk.h +++ b/ui/base/dragdrop/os_exchange_data_provider_gtk.h @@ -13,9 +13,9 @@ #include "base/pickle.h" #include "base/string16.h" -#include "gfx/point.h" #include "googleurl/src/gurl.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/gfx/point.h" namespace ui { diff --git a/ui/base/l10n/l10n_font_util.cc b/ui/base/l10n/l10n_font_util.cc index 9228de9..63d58e0 100644 --- a/ui/base/l10n/l10n_font_util.cc +++ b/ui/base/l10n/l10n_font_util.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "gfx/font.h" +#include "ui/gfx/font.h" namespace ui { diff --git a/ui/base/l10n/l10n_font_util.h b/ui/base/l10n/l10n_font_util.h index eca17ee..329b96d 100644 --- a/ui/base/l10n/l10n_font_util.h +++ b/ui/base/l10n/l10n_font_util.h @@ -6,7 +6,7 @@ #define UI_BASE_L10N_FONT_UTIL_H_ #pragma once -#include "gfx/size.h" +#include "ui/gfx/size.h" namespace gfx { class Font; diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 26e12c85..42cf591 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -24,10 +24,10 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" -#include "gfx/canvas.h" #include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/canvas.h" #include "unicode/rbbi.h" #include "unicode/uloc.h" diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h index 208186d..d838a56 100644 --- a/ui/base/models/menu_model.h +++ b/ui/base/models/menu_model.h @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" class SkBitmap; diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index 6f93748..ed5c14c 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -9,10 +9,10 @@ #include "base/string_piece.h" #include "base/synchronization/lock.h" #include "build/build_config.h" -#include "gfx/codec/png_codec.h" -#include "gfx/font.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/data_pack.h" +#include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/font.h" namespace ui { diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h index 9a961e2..9ff0e30 100644 --- a/ui/base/resource/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h @@ -21,7 +21,7 @@ #include "base/ref_counted_memory.h" #include "base/scoped_ptr.h" #include "base/string16.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" class SkBitmap; typedef uint32 SkColor; diff --git a/ui/base/resource/resource_bundle_dummy.cc b/ui/base/resource/resource_bundle_dummy.cc index 653d9f0..82afaab 100644 --- a/ui/base/resource/resource_bundle_dummy.cc +++ b/ui/base/resource/resource_bundle_dummy.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/synchronization/lock.h" -#include "gfx/font.h" -#include "gfx/platform_font_win.h" +#include "ui/gfx/font.h" +#include "ui/gfx/platform_font_win.h" // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific // files. The font members of ResourceBundle are never initialized in our code diff --git a/ui/base/resource/resource_bundle_linux.cc b/ui/base/resource/resource_bundle_linux.cc index 8bef0a2..eff8bdc 100644 --- a/ui/base/resource/resource_bundle_linux.cc +++ b/ui/base/resource/resource_bundle_linux.cc @@ -15,10 +15,10 @@ #include "base/string_piece.h" #include "base/string_util.h" #include "base/synchronization/lock.h" -#include "gfx/font.h" -#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/font.h" +#include "ui/gfx/gtk_util.h" namespace ui { diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc index cce0a9e..11011e2 100644 --- a/ui/base/resource/resource_bundle_posix.cc +++ b/ui/base/resource/resource_bundle_posix.cc @@ -9,9 +9,9 @@ #include "base/string16.h" #include "base/string_piece.h" #include "base/synchronization/lock.h" -#include "gfx/font.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/data_pack.h" +#include "ui/gfx/font.h" namespace ui { diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc index 7c02db1..14b2769 100644 --- a/ui/base/resource/resource_bundle_win.cc +++ b/ui/base/resource/resource_bundle_win.cc @@ -15,10 +15,10 @@ #include "base/string_piece.h" #include "base/synchronization/lock.h" #include "base/win/windows_version.h" -#include "gfx/font.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/data_pack.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/font.h" namespace ui { diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc index 8a262fd..132c6f5 100644 --- a/ui/base/text/text_elider.cc +++ b/ui/base/text/text_elider.cc @@ -14,11 +14,11 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "gfx/font.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" +#include "ui/gfx/font.h" namespace ui { diff --git a/ui/base/text/text_elider.h b/ui/base/text/text_elider.h index 97b9542..e8e0116 100644 --- a/ui/base/text/text_elider.h +++ b/ui/base/text/text_elider.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "gfx/font.h" +#include "ui/gfx/font.h" class FilePath; class GURL; diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc index 0889d27..7995df7 100644 --- a/ui/base/text/text_elider_unittest.cc +++ b/ui/base/text/text_elider_unittest.cc @@ -7,10 +7,10 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "gfx/font.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/text/text_elider.h" +#include "ui/gfx/font.h" namespace ui { diff --git a/ui/base/view_prop.h b/ui/base/view_prop.h index 339ef7b..23c5060 100644 --- a/ui/base/view_prop.h +++ b/ui/base/view_prop.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" namespace ui { diff --git a/ui/base/win/hwnd_util.cc b/ui/base/win/hwnd_util.cc index 9ecff94..4bd22a6 100644 --- a/ui/base/win/hwnd_util.cc +++ b/ui/base/win/hwnd_util.cc @@ -5,8 +5,8 @@ #include "ui/base/win/hwnd_util.h" #include "base/string_util.h" -#include "gfx/rect.h" -#include "gfx/size.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/win/window_impl.h b/ui/base/win/window_impl.h index e50159a..59b7562 100644 --- a/ui/base/win/window_impl.h +++ b/ui/base/win/window_impl.h @@ -14,8 +14,8 @@ #include <string> #include "base/logging.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" namespace ui { diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index 1232bc8..df8c8d8 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -23,9 +23,9 @@ #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/threading/thread.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "ui/base/x/x11_util_internal.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" namespace ui { diff --git a/ui/gfx/blit.cc b/ui/gfx/blit.cc index 8853339..9f57e68 100644 --- a/ui/gfx/blit.cc +++ b/ui/gfx/blit.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 "gfx/blit.h" +#include "ui/gfx/blit.h" #include "base/logging.h" #include "build/build_config.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_device.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) #include <cairo/cairo.h> diff --git a/ui/gfx/blit.h b/ui/gfx/blit.h index d5b1b5e..dc5a3a9 100644 --- a/ui/gfx/blit.h +++ b/ui/gfx/blit.h @@ -6,7 +6,7 @@ #define UI_GFX_BLIT_H_ #pragma once -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" namespace skia { class PlatformCanvas; diff --git a/ui/gfx/blit_unittest.cc b/ui/gfx/blit_unittest.cc index cea3296..356c66f 100644 --- a/ui/gfx/blit_unittest.cc +++ b/ui/gfx/blit_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "gfx/blit.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/blit.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" namespace { diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc index 28e6a8a..e787aab 100644 --- a/ui/gfx/canvas.cc +++ b/ui/gfx/canvas.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 "gfx/canvas.h" +#include "ui/gfx/canvas.h" namespace gfx { diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h index 9517602..8c89d59 100644 --- a/ui/gfx/canvas.h +++ b/ui/gfx/canvas.h @@ -9,9 +9,9 @@ #include <string> #include "base/string16.h" -#include "gfx/native_widget_types.h" // TODO(beng): remove this include when we no longer depend on SkTypes. #include "skia/ext/platform_canvas.h" +#include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/ui/gfx/canvas_direct2d.cc b/ui/gfx/canvas_direct2d.cc index cba7b64..61d3403 100644 --- a/ui/gfx/canvas_direct2d.cc +++ b/ui/gfx/canvas_direct2d.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/canvas_direct2d.h" +#include "ui/gfx/canvas_direct2d.h" #include "base/scoped_ptr.h" -#include "gfx/brush.h" -#include "gfx/rect.h" +#include "ui/gfx/brush.h" +#include "ui/gfx/rect.h" namespace { diff --git a/ui/gfx/canvas_direct2d.h b/ui/gfx/canvas_direct2d.h index 101688a..d87fdf3 100644 --- a/ui/gfx/canvas_direct2d.h +++ b/ui/gfx/canvas_direct2d.h @@ -11,7 +11,7 @@ #include <stack> #include "base/scoped_comptr_win.h" -#include "gfx/canvas.h" +#include "ui/gfx/canvas.h" namespace gfx { diff --git a/ui/gfx/canvas_direct2d_unittest.cc b/ui/gfx/canvas_direct2d_unittest.cc index 8884f32..fd18c7c 100644 --- a/ui/gfx/canvas_direct2d_unittest.cc +++ b/ui/gfx/canvas_direct2d_unittest.cc @@ -11,15 +11,15 @@ #include "base/ref_counted_memory.h" #include "base/resource_util.h" #include "base/scoped_ptr.h" -#include "gfx/brush.h" -#include "gfx/canvas_direct2d.h" -#include "gfx/canvas_skia.h" -#include "gfx/codec/png_codec.h" -#include "gfx/native_theme_win.h" -#include "gfx/rect.h" -#include "gfx/win_util.h" #include "grit/gfx_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/brush.h" +#include "ui/gfx/canvas_direct2d.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/native_theme_win.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/win_util.h" namespace { diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc index aa0cb9d..99174d1 100644 --- a/ui/gfx/canvas_skia.cc +++ b/ui/gfx/canvas_skia.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/canvas_skia.h" +#include "ui/gfx/canvas_skia.h" #include <limits> #include "base/i18n/rtl.h" #include "base/logging.h" -#include "gfx/brush.h" -#include "gfx/font.h" -#include "gfx/rect.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/gfx/brush.h" +#include "ui/gfx/font.h" +#include "ui/gfx/rect.h" #if defined(OS_WIN) -#include "gfx/canvas_skia_paint.h" +#include "ui/gfx/canvas_skia_paint.h" #endif namespace { diff --git a/ui/gfx/canvas_skia.h b/ui/gfx/canvas_skia.h index ce16fae..be44687 100644 --- a/ui/gfx/canvas_skia.h +++ b/ui/gfx/canvas_skia.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "gfx/canvas.h" #include "skia/ext/platform_canvas.h" +#include "ui/gfx/canvas.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) typedef struct _GdkPixbuf GdkPixbuf; diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_skia_linux.cc index ce2ae01..d418626 100644 --- a/ui/gfx/canvas_skia_linux.cc +++ b/ui/gfx/canvas_skia_linux.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 "gfx/canvas_skia.h" +#include "ui/gfx/canvas_skia.h" #include <cairo/cairo.h> #include <gtk/gtk.h> @@ -11,10 +11,10 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "gfx/font.h" -#include "gfx/gtk_util.h" -#include "gfx/platform_font_gtk.h" -#include "gfx/rect.h" +#include "ui/gfx/font.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/platform_font_gtk.h" +#include "ui/gfx/rect.h" namespace { diff --git a/ui/gfx/canvas_skia_mac.mm b/ui/gfx/canvas_skia_mac.mm index fb30055..c82e1aa 100644 --- a/ui/gfx/canvas_skia_mac.mm +++ b/ui/gfx/canvas_skia_mac.mm @@ -4,13 +4,13 @@ #import <Cocoa/Cocoa.h> -#include "gfx/canvas_skia.h" +#include "ui/gfx/canvas_skia.h" #include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" -#include "gfx/font.h" -#include "gfx/rect.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/gfx/font.h" +#include "ui/gfx/rect.h" namespace gfx { diff --git a/ui/gfx/canvas_skia_paint.h b/ui/gfx/canvas_skia_paint.h index 6ad854a..1d67b37 100644 --- a/ui/gfx/canvas_skia_paint.h +++ b/ui/gfx/canvas_skia_paint.h @@ -6,8 +6,8 @@ #define UI_GFX_CANVAS_SKIA_PAINT_H_ #pragma once -#include "gfx/canvas_skia.h" #include "skia/ext/canvas_paint.h" +#include "ui/gfx/canvas_skia.h" // Define a gfx::CanvasSkiaPaint type that wraps our gfx::Canvas like the // skia::PlatformCanvasPaint wraps PlatformCanvas. diff --git a/ui/gfx/canvas_skia_win.cc b/ui/gfx/canvas_skia_win.cc index 03186fa..1e108b3 100644 --- a/ui/gfx/canvas_skia_win.cc +++ b/ui/gfx/canvas_skia_win.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 "gfx/canvas_skia.h" +#include "ui/gfx/canvas_skia.h" #include <limits> #include "base/i18n/rtl.h" -#include "gfx/font.h" -#include "gfx/rect.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/gfx/font.h" +#include "ui/gfx/rect.h" namespace { diff --git a/ui/gfx/codec/jpeg_codec.cc b/ui/gfx/codec/jpeg_codec.cc index ad499e5..0558c93 100644 --- a/ui/gfx/codec/jpeg_codec.cc +++ b/ui/gfx/codec/jpeg_codec.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 "gfx/codec/jpeg_codec.h" +#include "ui/gfx/codec/jpeg_codec.h" #include <setjmp.h> diff --git a/ui/gfx/codec/jpeg_codec_unittest.cc b/ui/gfx/codec/jpeg_codec_unittest.cc index 16fc848..d705b6c 100644 --- a/ui/gfx/codec/jpeg_codec_unittest.cc +++ b/ui/gfx/codec/jpeg_codec_unittest.cc @@ -4,8 +4,8 @@ #include <math.h> -#include "gfx/codec/jpeg_codec.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/codec/jpeg_codec.h" namespace gfx { diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc index 5fd6d7a..a0dfbbe 100644 --- a/ui/gfx/codec/png_codec.cc +++ b/ui/gfx/codec/png_codec.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 "gfx/codec/png_codec.h" +#include "ui/gfx/codec/png_codec.h" #include "base/logging.h" #include "base/scoped_ptr.h" diff --git a/ui/gfx/codec/png_codec_unittest.cc b/ui/gfx/codec/png_codec_unittest.cc index 19d1f19..72ed671 100644 --- a/ui/gfx/codec/png_codec_unittest.cc +++ b/ui/gfx/codec/png_codec_unittest.cc @@ -4,10 +4,10 @@ #include <math.h> -#include "gfx/codec/png_codec.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" +#include "ui/gfx/codec/png_codec.h" namespace gfx { diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc index 73c585b..50ebe92 100644 --- a/ui/gfx/color_utils.cc +++ b/ui/gfx/color_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 "gfx/color_utils.h" +#include "ui/gfx/color_utils.h" #include <math.h> #if defined(OS_WIN) diff --git a/ui/gfx/color_utils_unittest.cc b/ui/gfx/color_utils_unittest.cc index 30cf514..83a6ce63 100644 --- a/ui/gfx/color_utils_unittest.cc +++ b/ui/gfx/color_utils_unittest.cc @@ -4,10 +4,10 @@ #include <stdlib.h> -#include "gfx/color_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorPriv.h" +#include "ui/gfx/color_utils.h" TEST(ColorUtils, SkColorToHSLRed) { color_utils::HSL hsl = { 0, 0, 0 }; diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc index 78b1a34..08b7b34 100644 --- a/ui/gfx/font.cc +++ b/ui/gfx/font.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/font.h" +#include "ui/gfx/font.h" #include "base/utf_string_conversions.h" -#include "gfx/platform_font.h" +#include "ui/gfx/platform_font.h" namespace gfx { diff --git a/ui/gfx/font.h b/ui/gfx/font.h index 2091ae3..78ed18b 100644 --- a/ui/gfx/font.h +++ b/ui/gfx/font.h @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/string16.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc index 43eaa7c..d5854c0 100644 --- a/ui/gfx/font_unittest.cc +++ b/ui/gfx/font_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/font.h" +#include "ui/gfx/font.h" #include "base/utf_string_conversions.h" #if defined(OS_WIN) -#include "gfx/platform_font_win.h" +#include "ui/gfx/platform_font_win.h" #endif // defined(OS_WIN) #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/gfx/gdi_util.cc b/ui/gfx/gdi_util.cc index 5dbb5b5..0aa48ba 100644 --- a/ui/gfx/gdi_util.cc +++ b/ui/gfx/gdi_util.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 "gfx/gdi_util.h" +#include "ui/gfx/gdi_util.h" namespace gfx { diff --git a/ui/gfx/gdi_util.h b/ui/gfx/gdi_util.h index e79a34f..8f0216e 100644 --- a/ui/gfx/gdi_util.h +++ b/ui/gfx/gdi_util.h @@ -9,7 +9,7 @@ #include <vector> #include <windows.h> -#include "gfx/rect.h" +#include "ui/gfx/rect.h" namespace gfx { diff --git a/ui/gfx/gfx_module.cc b/ui/gfx/gfx_module.cc index 882efad..abcd008 100644 --- a/ui/gfx/gfx_module.cc +++ b/ui/gfx/gfx_module.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 "gfx/gfx_module.h" +#include "ui/gfx/gfx_module.h" namespace gfx { diff --git a/ui/gfx/gfx_paths.cc b/ui/gfx/gfx_paths.cc index bcb82ab..6e91a77 100644 --- a/ui/gfx/gfx_paths.cc +++ b/ui/gfx/gfx_paths.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 "gfx/gfx_paths.h" +#include "ui/gfx/gfx_paths.h" #include "base/command_line.h" #include "base/file_path.h" diff --git a/ui/gfx/gtk_native_view_id_manager.cc b/ui/gfx/gtk_native_view_id_manager.cc index e9e72f2..3efc3c7 100644 --- a/ui/gfx/gtk_native_view_id_manager.cc +++ b/ui/gfx/gtk_native_view_id_manager.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 "gfx/gtk_native_view_id_manager.h" +#include "ui/gfx/gtk_native_view_id_manager.h" #include <gtk/gtk.h> #include <gdk/gdkx.h> #include "base/logging.h" #include "base/rand_util.h" -#include "gfx/gtk_preserve_window.h" +#include "ui/gfx/gtk_preserve_window.h" // ----------------------------------------------------------------------------- // Bounce functions for GTK to callback into a C++ object... diff --git a/ui/gfx/gtk_native_view_id_manager.h b/ui/gfx/gtk_native_view_id_manager.h index 6befcfc..ca38211 100644 --- a/ui/gfx/gtk_native_view_id_manager.h +++ b/ui/gfx/gtk_native_view_id_manager.h @@ -10,7 +10,7 @@ #include "base/singleton.h" #include "base/synchronization/lock.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" typedef unsigned long XID; struct _GtkPreserveWindow; diff --git a/ui/gfx/gtk_preserve_window.cc b/ui/gfx/gtk_preserve_window.cc index 20215d1..973af1f 100644 --- a/ui/gfx/gtk_preserve_window.cc +++ b/ui/gfx/gtk_preserve_window.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 "gfx/gtk_preserve_window.h" +#include "ui/gfx/gtk_preserve_window.h" #include <gdk/gdkwindow.h> #include <gtk/gtk.h> diff --git a/ui/gfx/gtk_util.cc b/ui/gfx/gtk_util.cc index fc240e0..52b74ac 100644 --- a/ui/gfx/gtk_util.cc +++ b/ui/gfx/gtk_util.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 "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" #include <gdk/gdk.h> #include <gtk/gtk.h> @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/linux_util.h" -#include "gfx/rect.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" +#include "ui/gfx/rect.h" namespace { diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc index cabc505..57d8973 100644 --- a/ui/gfx/icon_util.cc +++ b/ui/gfx/icon_util.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/icon_util.h" +#include "ui/gfx/icon_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/win/scoped_handle.h" -#include "gfx/size.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/size.h" // Defining the dimensions for the icon images. We store only one value because // we always resize to a square image; that is, the value 48 means that we are diff --git a/ui/gfx/icon_util_unittest.cc b/ui/gfx/icon_util_unittest.cc index 43eca49..b78408f 100644 --- a/ui/gfx/icon_util_unittest.cc +++ b/ui/gfx/icon_util_unittest.cc @@ -5,11 +5,11 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_ptr.h" -#include "gfx/gfx_paths.h" -#include "gfx/icon_util.h" -#include "gfx/size.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/gfx_paths.h" +#include "ui/gfx/icon_util.h" +#include "ui/gfx/size.h" namespace { diff --git a/ui/gfx/insets.cc b/ui/gfx/insets.cc index 06cc6aa..8262ebf 100644 --- a/ui/gfx/insets.cc +++ b/ui/gfx/insets.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 "gfx/insets.h" +#include "ui/gfx/insets.h" #include "base/string_util.h" diff --git a/ui/gfx/insets_unittest.cc b/ui/gfx/insets_unittest.cc index 30d6d7f..563f20f 100644 --- a/ui/gfx/insets_unittest.cc +++ b/ui/gfx/insets_unittest.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 "gfx/insets.h" +#include "ui/gfx/insets.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/gfx/native_theme_linux.cc b/ui/gfx/native_theme_linux.cc index b2087fe..766b003 100644 --- a/ui/gfx/native_theme_linux.cc +++ b/ui/gfx/native_theme_linux.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/native_theme_linux.h" +#include "ui/gfx/native_theme_linux.h" #include <limits> #include "base/logging.h" -#include "gfx/codec/png_codec.h" -#include "gfx/color_utils.h" -#include "gfx/gfx_module.h" -#include "gfx/size.h" -#include "gfx/rect.h" #include "grit/gfx_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/color_utils.h" +#include "ui/gfx/gfx_module.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" namespace gfx { diff --git a/ui/gfx/native_theme_win.cc b/ui/gfx/native_theme_win.cc index b563b4f..6fe134b 100644 --- a/ui/gfx/native_theme_win.cc +++ b/ui/gfx/native_theme_win.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 "gfx/native_theme_win.h" +#include "ui/gfx/native_theme_win.h" #include <windows.h> #include <uxtheme.h> @@ -14,11 +14,11 @@ #include "base/win/scoped_gdi_object.h" #include "base/win/scoped_hdc.h" #include "base/win/windows_version.h" -#include "gfx/gdi_util.h" -#include "gfx/rect.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/gfx/gdi_util.h" +#include "ui/gfx/rect.h" namespace { diff --git a/ui/gfx/native_theme_win.h b/ui/gfx/native_theme_win.h index ff94e52..1f99038 100644 --- a/ui/gfx/native_theme_win.h +++ b/ui/gfx/native_theme_win.h @@ -12,10 +12,10 @@ #define UI_GFX_NATIVE_THEME_WIN_H_ #pragma once +#include "ui/gfx/size.h" #include <windows.h> #include <uxtheme.h> #include "base/basictypes.h" -#include "gfx/size.h" #include "third_party/skia/include/core/SkColor.h" namespace skia { diff --git a/ui/gfx/native_theme_win_unittest.cc b/ui/gfx/native_theme_win_unittest.cc index b087da6..27820ab 100644 --- a/ui/gfx/native_theme_win_unittest.cc +++ b/ui/gfx/native_theme_win_unittest.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 "gfx/native_theme_win.h" +#include "ui/gfx/native_theme_win.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/gfx/native_widget_types_gtk.cc b/ui/gfx/native_widget_types_gtk.cc index ccf428c..1beeec5 100644 --- a/ui/gfx/native_widget_types_gtk.cc +++ b/ui/gfx/native_widget_types_gtk.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" -#include "gfx/gtk_native_view_id_manager.h" +#include "ui/gfx/gtk_native_view_id_manager.h" namespace gfx { diff --git a/ui/gfx/path.cc b/ui/gfx/path.cc index e456679..bdbed40 100644 --- a/ui/gfx/path.cc +++ b/ui/gfx/path.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 "gfx/path.h" +#include "ui/gfx/path.h" #include "base/logging.h" diff --git a/ui/gfx/path.h b/ui/gfx/path.h index 9202e8e..eec01fc3 100644 --- a/ui/gfx/path.h +++ b/ui/gfx/path.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" #include "third_party/skia/include/core/SkPath.h" diff --git a/ui/gfx/path_gtk.cc b/ui/gfx/path_gtk.cc index 2149aad..b21ea9b 100644 --- a/ui/gfx/path_gtk.cc +++ b/ui/gfx/path_gtk.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 "gfx/path.h" +#include "ui/gfx/path.h" #include <gdk/gdk.h> diff --git a/ui/gfx/path_win.cc b/ui/gfx/path_win.cc index b5f206c..ef09959 100644 --- a/ui/gfx/path_win.cc +++ b/ui/gfx/path_win.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 "gfx/path.h" +#include "ui/gfx/path.h" #include "base/scoped_ptr.h" diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h index 32cba2c..7b1874d 100644 --- a/ui/gfx/platform_font.h +++ b/ui/gfx/platform_font.h @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/string16.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/ui/gfx/platform_font_gtk.cc b/ui/gfx/platform_font_gtk.cc index 82b2e06..ac0831f 100644 --- a/ui/gfx/platform_font_gtk.cc +++ b/ui/gfx/platform_font_gtk.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 "gfx/platform_font_gtk.h" +#include "ui/gfx/platform_font_gtk.h" #include <algorithm> #include <fontconfig/fontconfig.h> @@ -14,11 +14,11 @@ #include "base/logging.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" -#include "gfx/canvas_skia.h" -#include "gfx/font.h" -#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/font.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/ui/gfx/platform_font_gtk.h b/ui/gfx/platform_font_gtk.h index 4b265dd..44912b4 100644 --- a/ui/gfx/platform_font_gtk.h +++ b/ui/gfx/platform_font_gtk.h @@ -7,8 +7,8 @@ #pragma once #include "base/scoped_ptr.h" -#include "gfx/platform_font.h" #include "third_party/skia/include/core/SkRefCnt.h" +#include "ui/gfx/platform_font.h" class SkTypeface; class SkPaint; diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h index 123400c..9dd576f 100644 --- a/ui/gfx/platform_font_mac.h +++ b/ui/gfx/platform_font_mac.h @@ -6,7 +6,7 @@ #define UI_GFX_PLATFORM_FONT_MAC_ #pragma once -#include "gfx/platform_font.h" +#include "ui/gfx/platform_font.h" namespace gfx { diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm index 4aa9b88..46f69ef 100644 --- a/ui/gfx/platform_font_mac.mm +++ b/ui/gfx/platform_font_mac.mm @@ -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 "gfx/platform_font_mac.h" +#include "ui/gfx/platform_font_mac.h" #include <Cocoa/Cocoa.h> @@ -10,8 +10,8 @@ #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "gfx/canvas_skia.h" -#include "gfx/font.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/font.h" namespace gfx { diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc index 8071640..3402f0d 100644 --- a/ui/gfx/platform_font_win.cc +++ b/ui/gfx/platform_font_win.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 "gfx/platform_font_win.h" +#include "ui/gfx/platform_font_win.h" #include <windows.h> #include <math.h> @@ -13,8 +13,8 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/win_util.h" -#include "gfx/canvas_skia.h" -#include "gfx/font.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/font.h" namespace { diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h index 4b18cd1..a7a25c4 100644 --- a/ui/gfx/platform_font_win.h +++ b/ui/gfx/platform_font_win.h @@ -7,7 +7,7 @@ #pragma once #include "base/ref_counted.h" -#include "gfx/platform_font.h" +#include "ui/gfx/platform_font.h" namespace gfx { diff --git a/ui/gfx/point.cc b/ui/gfx/point.cc index d601580..0dc5274 100644 --- a/ui/gfx/point.cc +++ b/ui/gfx/point.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 "gfx/point.h" +#include "ui/gfx/point.h" #if defined(OS_WIN) #include <windows.h> diff --git a/ui/gfx/rect.cc b/ui/gfx/rect.cc index a1a72cb..5831658 100644 --- a/ui/gfx/rect.cc +++ b/ui/gfx/rect.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 "gfx/rect.h" +#include "ui/gfx/rect.h" #if defined(OS_WIN) #include <windows.h> @@ -14,7 +14,7 @@ #include <ostream> -#include "gfx/insets.h" +#include "ui/gfx/insets.h" namespace { diff --git a/ui/gfx/rect.h b/ui/gfx/rect.h index 1a1d9e6..c65489f 100644 --- a/ui/gfx/rect.h +++ b/ui/gfx/rect.h @@ -15,8 +15,8 @@ #include <iosfwd> -#include "gfx/point.h" -#include "gfx/size.h" +#include "ui/gfx/point.h" +#include "ui/gfx/size.h" #if defined(OS_WIN) typedef struct tagRECT RECT; diff --git a/ui/gfx/rect_unittest.cc b/ui/gfx/rect_unittest.cc index f5b4d9b..00095b2 100644 --- a/ui/gfx/rect_unittest.cc +++ b/ui/gfx/rect_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "gfx/rect.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/rect.h" typedef testing::Test RectTest; diff --git a/ui/gfx/run_all_unittests.cc b/ui/gfx/run_all_unittests.cc index 834d7c8..96dd068 100644 --- a/ui/gfx/run_all_unittests.cc +++ b/ui/gfx/run_all_unittests.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 "gfx/test_suite.h" +#include "ui/gfx/test_suite.h" int main(int argc, char** argv) { return GfxTestSuite(argc, argv).Run(); diff --git a/ui/gfx/scoped_image.h b/ui/gfx/scoped_image.h index 58cb900f..12e411a 100644 --- a/ui/gfx/scoped_image.h +++ b/ui/gfx/scoped_image.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "build/build_config.h" -#include "gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/native_widget_types.h" #if defined(OS_LINUX) #include <glib-object.h> diff --git a/ui/gfx/scoped_image_unittest.cc b/ui/gfx/scoped_image_unittest.cc index 8e8b312..0123983 100644 --- a/ui/gfx/scoped_image_unittest.cc +++ b/ui/gfx/scoped_image_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "base/scoped_ptr.h" -#include "gfx/scoped_image.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/scoped_image.h" #if defined(OS_LINUX) -#include "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" #elif defined(OS_MACOSX) #include "base/mac/mac_util.h" #include "skia/ext/skia_utils_mac.h" diff --git a/ui/gfx/scrollbar_size.cc b/ui/gfx/scrollbar_size.cc index 426b0ac..d58fd95 100644 --- a/ui/gfx/scrollbar_size.cc +++ b/ui/gfx/scrollbar_size.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 "gfx/scrollbar_size.h" +#include "ui/gfx/scrollbar_size.h" #include "base/compiler_specific.h" diff --git a/ui/gfx/size.cc b/ui/gfx/size.cc index 6e5528e..6b72aede 100644 --- a/ui/gfx/size.cc +++ b/ui/gfx/size.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 "gfx/size.h" +#include "ui/gfx/size.h" #if defined(OS_WIN) #include <windows.h> diff --git a/ui/gfx/skbitmap_operations.cc b/ui/gfx/skbitmap_operations.cc index 6899553..d3b4d8c 100644 --- a/ui/gfx/skbitmap_operations.cc +++ b/ui/gfx/skbitmap_operations.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 "gfx/skbitmap_operations.h" +#include "ui/gfx/skbitmap_operations.h" #include <algorithm> #include <string.h> diff --git a/ui/gfx/skbitmap_operations.h b/ui/gfx/skbitmap_operations.h index 12ae86a..cde09cb 100644 --- a/ui/gfx/skbitmap_operations.h +++ b/ui/gfx/skbitmap_operations.h @@ -7,7 +7,7 @@ #pragma once #include "base/gtest_prod_util.h" -#include "gfx/color_utils.h" +#include "ui/gfx/color_utils.h" class SkBitmap; diff --git a/ui/gfx/skbitmap_operations_unittest.cc b/ui/gfx/skbitmap_operations_unittest.cc index bcad287..3e0c23c 100644 --- a/ui/gfx/skbitmap_operations_unittest.cc +++ b/ui/gfx/skbitmap_operations_unittest.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 "gfx/skbitmap_operations.h" +#include "ui/gfx/skbitmap_operations.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/ui/gfx/skia_util.cc b/ui/gfx/skia_util.cc index 865f8fda..c5bd32b 100644 --- a/ui/gfx/skia_util.cc +++ b/ui/gfx/skia_util.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/skia_util.h" +#include "ui/gfx/skia_util.h" -#include "gfx/rect.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorPriv.h" #include "third_party/skia/include/core/SkShader.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/gfx/rect.h" namespace gfx { diff --git a/ui/gfx/skia_utils_gtk.cc b/ui/gfx/skia_utils_gtk.cc index 8ed4bec..8667612 100644 --- a/ui/gfx/skia_utils_gtk.cc +++ b/ui/gfx/skia_utils_gtk.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 "gfx/skia_utils_gtk.h" +#include "ui/gfx/skia_utils_gtk.h" #include <gdk/gdkcolor.h> diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc index 02e1f7f..6cbb32b 100644 --- a/ui/gfx/test_suite.cc +++ b/ui/gfx/test_suite.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gfx/test_suite.h" +#include "ui/gfx/test_suite.h" -#include "gfx/gfx_paths.h" #include "base/file_path.h" #include "base/path_service.h" #include "base/mac/scoped_nsautorelease_pool.h" +#include "ui/gfx/gfx_paths.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/ui/gfx/win_util.cc b/ui/gfx/win_util.cc index 9941a65..e55a577 100644 --- a/ui/gfx/win_util.cc +++ b/ui/gfx/win_util.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 "gfx/win_util.h" +#include "ui/gfx/win_util.h" #include <windows.h> diff --git a/ui/views/demo/main.cc b/ui/views/demo/main.cc index f3b2763..eca756f 100644 --- a/ui/views/demo/main.cc +++ b/ui/views/demo/main.cc @@ -10,7 +10,7 @@ #include "base/at_exit.h" #include "base/message_loop.h" -#include "gfx/canvas.h" +#include "ui/gfx/canvas.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/native_widget_win.h" diff --git a/ui/views/events/event.h b/ui/views/events/event.h index c3cbce0..65d31f6 100644 --- a/ui/views/events/event.h +++ b/ui/views/events/event.h @@ -7,8 +7,8 @@ #pragma once #include "base/basictypes.h" -#include "gfx/point.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/gfx/point.h" #include "ui/views/native_types.h" class OSExchangeData; diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h index a4a919c..1f48744 100644 --- a/ui/views/focus/focus_manager.h +++ b/ui/views/focus/focus_manager.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/singleton.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" #include "ui/views/events/accelerator.h" #include "ui/views/events/focus_event.h" diff --git a/ui/views/native_types.h b/ui/views/native_types.h index c17a1bb..73b0358 100644 --- a/ui/views/native_types.h +++ b/ui/views/native_types.h @@ -6,7 +6,7 @@ #define UI_VIEWS_NATIVE_TYPES_H_ #pragma once -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" namespace ui { diff --git a/ui/views/rendering/border.cc b/ui/views/rendering/border.cc index 34493e6..c4d0200 100644 --- a/ui/views/rendering/border.cc +++ b/ui/views/rendering/border.cc @@ -4,7 +4,7 @@ #include "ui/views/rendering/border.h" -#include "gfx/canvas.h" +#include "ui/gfx/canvas.h" #include "ui/views/view.h" namespace ui { diff --git a/ui/views/rendering/border.h b/ui/views/rendering/border.h index e1b196f..6a24411 100644 --- a/ui/views/rendering/border.h +++ b/ui/views/rendering/border.h @@ -6,8 +6,8 @@ #define UI_VIEWS_BORDER_H_ #include "base/logging.h" -#include "gfx/insets.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/gfx/insets.h" namespace gfx { class Canvas; diff --git a/ui/views/rendering/border_unittest.cc b/ui/views/rendering/border_unittest.cc index 507c904..2b7740d 100644 --- a/ui/views/rendering/border_unittest.cc +++ b/ui/views/rendering/border_unittest.cc @@ -4,8 +4,8 @@ #include <algorithm> -#include "gfx/canvas.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/canvas.h" #include "ui/views/rendering/border.h" #include "ui/views/view.h" diff --git a/ui/views/view.cc b/ui/views/view.cc index b102eef..ac4bd11 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc @@ -7,10 +7,10 @@ #include <algorithm> #include <functional> -#include "gfx/canvas.h" -#include "gfx/point.h" -#include "gfx/size.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/gfx/canvas.h" +#include "ui/gfx/point.h" +#include "ui/gfx/size.h" #include "ui/views/events/context_menu_controller.h" #include "ui/views/events/drag_controller.h" #include "ui/views/layout/layout_manager.h" diff --git a/ui/views/view.h b/ui/views/view.h index 701efea..e3940fc 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/scoped_ptr.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" namespace gfx { class Canvas; @@ -443,4 +443,4 @@ TODO(beng): - native_widget_views - native_widget_gtk -*/
\ No newline at end of file +*/ diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 14873a0..3d5e954 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -4,8 +4,8 @@ #include <algorithm> -#include "gfx/canvas.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/canvas.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index 15e9aff..250ae2f 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -5,12 +5,12 @@ #include "ui/views/widget/native_widget_win.h" #include "base/scoped_ptr.h" -#include "gfx/canvas_skia.h" -#include "gfx/path.h" -#include "gfx/native_theme_win.h" #include "ui/base/system_monitor/system_monitor.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/native_theme_win.h" +#include "ui/gfx/path.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index 56515d1..3a375bc 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "gfx/point.h" +#include "ui/gfx/point.h" #include "ui/views/native_types.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/widget/native_widget_listener.h" |