diff options
Diffstat (limited to 'views/controls/table')
-rw-r--r-- | views/controls/table/group_table_view.cc | 2 | ||||
-rw-r--r-- | views/controls/table/native_table_gtk.cc | 2 | ||||
-rw-r--r-- | views/controls/table/native_table_win.cc | 6 | ||||
-rw-r--r-- | views/controls/table/native_table_wrapper.h | 2 | ||||
-rw-r--r-- | views/controls/table/table_view.cc | 8 | ||||
-rw-r--r-- | views/controls/table/table_view2.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/views/controls/table/group_table_view.cc b/views/controls/table/group_table_view.cc index cf35d73..0c70e74 100644 --- a/views/controls/table/group_table_view.cc +++ b/views/controls/table/group_table_view.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/task.h" -#include "gfx/canvas.h" +#include "ui/gfx/canvas.h" namespace views { diff --git a/views/controls/table/native_table_gtk.cc b/views/controls/table/native_table_gtk.cc index 99569995..87040bc 100644 --- a/views/controls/table/native_table_gtk.cc +++ b/views/controls/table/native_table_gtk.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/gtk_util.h" #include "views/controls/table/table_view2.h" #include "views/controls/table/table_view_observer.h" #include "views/widget/widget.h" diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc index a0291bb..bc40a55 100644 --- a/views/controls/table/native_table_win.cc +++ b/views/controls/table/native_table_win.cc @@ -8,14 +8,14 @@ #include <windowsx.h> #include "base/logging.h" -#include "gfx/canvas_skia.h" -#include "gfx/favicon_size.h" -#include "gfx/icon_util.h" #include "skia/ext/skia_utils_win.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/models/table_model.h" #include "ui/base/win/hwnd_util.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/favicon_size.h" +#include "ui/gfx/icon_util.h" #include "views/controls/table/table_view2.h" #include "views/controls/table/table_view_observer.h" #include "views/widget/widget.h" diff --git a/views/controls/table/native_table_wrapper.h b/views/controls/table/native_table_wrapper.h index c81d32d6..f5232a0 100644 --- a/views/controls/table/native_table_wrapper.h +++ b/views/controls/table/native_table_wrapper.h @@ -6,7 +6,7 @@ #define VIEWS_CONTROLS_TABLE_NATIVE_TABLE_WRAPPER_H_ #pragma once -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" using ui::TableColumn; diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc index 4bfd7749..df79b91 100644 --- a/views/controls/table/table_view.cc +++ b/views/controls/table/table_view.cc @@ -11,10 +11,6 @@ #include "base/i18n/rtl.h" #include "base/string_util.h" -#include "gfx/canvas_skia.h" -#include "gfx/favicon_size.h" -#include "gfx/font.h" -#include "gfx/icon_util.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorFilter.h" @@ -23,6 +19,10 @@ #include "ui/base/models/table_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/favicon_size.h" +#include "ui/gfx/font.h" +#include "ui/gfx/icon_util.h" #include "views/controls/native/native_view_host.h" #include "views/controls/table/table_view_observer.h" diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h index 9d76bb2..679a6c8 100644 --- a/views/controls/table/table_view2.h +++ b/views/controls/table/table_view2.h @@ -12,7 +12,7 @@ #include <vector> #include "base/scoped_ptr.h" -#include "gfx/rect.h" +#include "ui/gfx/rect.h" #include "views/controls/table/table_view.h" #include "views/controls/table/native_table_wrapper.h" #include "views/view.h" |