diff options
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 5 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_factory.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/web_contents_view_gtk.cc | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index b20c3e3..5918191 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -13,13 +13,8 @@ #include "base/gfx/native_widget_types.h" #include "base/gfx/rect.h" #include "base/scoped_ptr.h" -#if defined(OS_WIN) -// TODO(evanm): I mean really, c'mon, this can't have broken the build, right? #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/tab_contents/constrained_window.h" -#else -#include "chrome/common/temp_scaffolding_stubs.h" -#endif #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/page_navigator.h" diff --git a/chrome/browser/tab_contents/tab_contents_factory.cc b/chrome/browser/tab_contents/tab_contents_factory.cc index b7ef10e..c519a3f 100644 --- a/chrome/browser/tab_contents/tab_contents_factory.cc +++ b/chrome/browser/tab_contents/tab_contents_factory.cc @@ -9,6 +9,7 @@ #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_factory.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/url_constants.h" @@ -16,7 +17,6 @@ #if defined(OS_WIN) // TODO(port): port these headers to posix. -#include "chrome/browser/tab_contents/tab_contents.h" #elif defined(OS_POSIX) #include "chrome/common/temp_scaffolding_stubs.h" #endif diff --git a/chrome/browser/tab_contents/web_contents_view_gtk.cc b/chrome/browser/tab_contents/web_contents_view_gtk.cc index 9eaaf39..431b10a 100644 --- a/chrome/browser/tab_contents/web_contents_view_gtk.cc +++ b/chrome/browser/tab_contents/web_contents_view_gtk.cc @@ -7,6 +7,7 @@ #include <gdk/gdk.h> #include <gtk/gtk.h> +#include "base/string_util.h" #include "base/gfx/point.h" #include "base/gfx/rect.h" #include "chrome/browser/gtk/browser_window_gtk.h" |