diff options
author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 14:01:33 +0000 |
---|---|---|
committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 14:01:33 +0000 |
commit | 6c077af5c79a85d64e4b4363b8d0e29bb16543db (patch) | |
tree | 160a0dc0eb5b39a3c302655a287d1594d4ccf58e /chrome/browser/gtk | |
parent | 9bb2d8b4792cbf769d744fd972da2d94e9fa9647 (diff) | |
download | chromium_src-6c077af5c79a85d64e4b4363b8d0e29bb16543db.zip chromium_src-6c077af5c79a85d64e4b4363b8d0e29bb16543db.tar.gz chromium_src-6c077af5c79a85d64e4b4363b8d0e29bb16543db.tar.bz2 |
Remove dependency from webkit on chrome/common by moving files to src/app.
BUG=37985
TEST=no functional change.
Review URL: http://codereview.chromium.org/1060001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r-- | chrome/browser/gtk/browser_window_gtk.h | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/gtk_util.cc | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/gtk_util.h | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/tabs/dragged_tab_gtk.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h index 822dff0..f24e094 100644 --- a/chrome/browser/gtk/browser_window_gtk.h +++ b/chrome/browser/gtk/browser_window_gtk.h @@ -10,6 +10,7 @@ #include <map> #include "app/active_window_watcher_x.h" +#include "app/x11_util.h" #include "base/scoped_ptr.h" #include "base/timer.h" #include "build/build_config.h" @@ -17,7 +18,6 @@ #include "chrome/browser/pref_member.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/x11_util.h" #include "gfx/rect.h" class BookmarkBarGtk; diff --git a/chrome/browser/gtk/gtk_util.cc b/chrome/browser/gtk/gtk_util.cc index c9512b2..ea46705 100644 --- a/chrome/browser/gtk/gtk_util.cc +++ b/chrome/browser/gtk/gtk_util.cc @@ -13,6 +13,7 @@ #include "app/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/x11_util.h" #include "base/linux_util.h" #include "base/logging.h" #include "chrome/browser/browser_list.h" @@ -20,7 +21,6 @@ #include "chrome/browser/gtk/cairo_cached_surface.h" #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/common/renderer_preferences.h" -#include "chrome/common/x11_util.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/gtk/gtk_util.h b/chrome/browser/gtk/gtk_util.h index b2149b3..541464b 100644 --- a/chrome/browser/gtk/gtk_util.h +++ b/chrome/browser/gtk/gtk_util.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "chrome/common/x11_util.h" +#include "app/x11_util.h" #include "gfx/point.h" #include "gfx/rect.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h index 46905df..69602a8 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h +++ b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h @@ -9,12 +9,12 @@ #include <set> +#include "app/x11_util.h" #include "base/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/dock_info.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/x11_util.h" class DraggedTabGtk; class TabGtk; diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc index 25a32048..c11e3f4 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc +++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc @@ -10,6 +10,7 @@ #include "app/gfx/canvas_paint.h" #include "app/l10n_util.h" +#include "app/x11_util.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h" @@ -18,7 +19,6 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/common/x11_util.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkShader.h" |