Move infobar_delegate.[cc,h] back to chrome/browser/tab_contents.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/6621009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76996 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 14 insertions, 14 deletions

diff --git a/chrome/browser/tab_contents/confirm_infobar_delegate.h b/chrome/browser/tab_contents/confirm_infobar_delegate.h
index a02f8c4..07a9f3d 100644
--- a/chrome/browser/tab_contents/confirm_infobar_delegate.h
+++ b/chrome/browser/tab_contents/confirm_infobar_delegate.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "content/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 
 // An interface derived from InfoBarDelegate implemented by objects wishing to
 // control a ConfirmInfoBar.
diff --git a/content/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc
index 77b76c9..ac5c757 100644
--- a/content/browser/tab_contents/infobar_delegate.cc
+++ b/chrome/browser/tab_contents/infobar_delegate.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 "content/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/navigation_controller.h"
+#include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 // InfoBarDelegate ------------------------------------------------------------
diff --git a/content/browser/tab_contents/infobar_delegate.h b/chrome/browser/tab_contents/infobar_delegate.h
index b4c6921..f1e3e6f3 100644
--- a/content/browser/tab_contents/infobar_delegate.h
+++ b/chrome/browser/tab_contents/infobar_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
-#define CONTENT_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
+#define CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -115,4 +115,4 @@ class InfoBarDelegate {
   DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate);
 };
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/tab_contents/link_infobar_delegate.h b/chrome/browser/tab_contents/link_infobar_delegate.h
index 8be8cb0..61bbcbb 100644
--- a/chrome/browser/tab_contents/link_infobar_delegate.h
+++ b/chrome/browser/tab_contents/link_infobar_delegate.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "content/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 
 class TabContents;
 
diff --git a/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc b/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc
index 54beab7..4bce8b1 100644
--- a/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc
@@ -11,6 +11,7 @@
 #include "base/command_line.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
@@ -18,7 +19,6 @@
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/tab_contents/infobar_delegate.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace {
diff --git a/chrome/browser/ui/gtk/infobars/infobar_gtk.h b/chrome/browser/ui/gtk/infobars/infobar_gtk.h
index 206f85e..30f349a 100644
--- a/chrome/browser/ui/gtk/infobars/infobar_gtk.h
+++ b/chrome/browser/ui/gtk/infobars/infobar_gtk.h
@@ -8,12 +8,12 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/ui/gtk/infobars/infobar_arrow_model.h"
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "content/browser/tab_contents/infobar_delegate.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/gtk/gtk_signal.h"
 
diff --git a/chrome/browser/ui/views/infobars/infobar_background.h b/chrome/browser/ui/views/infobars/infobar_background.h
index 9c1e127..1849588 100644
--- a/chrome/browser/ui/views/infobars/infobar_background.h
+++ b/chrome/browser/ui/views/infobars/infobar_background.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/scoped_ptr.h"
-#include "content/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "views/background.h"
 
 class InfoBarBackground : public views::Background {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f99278a..825f2af 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1967,6 +1967,8 @@
         'browser/tab_contents/background_contents.h',
         'browser/tab_contents/confirm_infobar_delegate.cc',
         'browser/tab_contents/confirm_infobar_delegate.h',
+        'browser/tab_contents/infobar_delegate.cc',
+        'browser/tab_contents/infobar_delegate.h',
         'browser/tab_contents/link_infobar_delegate.cc',
         'browser/tab_contents/link_infobar_delegate.h',
         'browser/tab_contents/simple_alert_infobar_delegate.cc',
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 2668403..df3c768 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -54,6 +54,7 @@
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
 #include "chrome/browser/sessions/session_types.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/translate/page_translated_details.h"
@@ -83,7 +84,6 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/renderer_host/resource_request_details.h"
 #include "content/browser/site_instance.h"
-#include "content/browser/tab_contents/infobar_delegate.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc
index 87bed9a..85d6fce 100644
--- a/content/browser/tab_contents/test_tab_contents.cc
+++ b/content/browser/tab_contents/test_tab_contents.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "chrome/browser/browser_url_handler.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/page_transition_types.h"
@@ -14,7 +15,6 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
-#include "content/browser/tab_contents/infobar_delegate.h"
 
 TestTabContents::TestTabContents(Profile* profile, SiteInstance* instance)
     : TabContents(profile, instance, MSG_ROUTING_NONE, NULL, NULL),
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 494b39e..f1bbae9 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -279,8 +279,6 @@
         'browser/speech/speech_recognizer.cc',
         'browser/speech/speech_recognizer.h',
         'browser/tab_contents/constrained_window.h',
-        'browser/tab_contents/infobar_delegate.cc',
-        'browser/tab_contents/infobar_delegate.h',
         'browser/tab_contents/interstitial_page.cc',
         'browser/tab_contents/interstitial_page.h',
         'browser/tab_contents/language_state.cc',