summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 01:01:49 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 01:01:49 +0000
commita035dfda4f12bcc1ba89973621abea62121fe29b (patch)
tree7fa382fcf43d8b5ae059a7be9b5751114d90e727 /content
parentcac27f7569dd16b2699e730626518b7e7bae64cf (diff)
downloadchromium_src-a035dfda4f12bcc1ba89973621abea62121fe29b.zip
chromium_src-a035dfda4f12bcc1ba89973621abea62121fe29b.tar.gz
chromium_src-a035dfda4f12bcc1ba89973621abea62121fe29b.tar.bz2
Get rid of temporary render_view_host.h.
TBR=avi Review URL: http://codereview.chromium.org/6598084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents_observer.cc2
-rw-r--r--content/browser/webui/web_ui.cc6
-rw-r--r--content/browser/webui/web_ui_handler_browsertest.cc2
3 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/tab_contents/tab_contents_observer.cc b/content/browser/tab_contents/tab_contents_observer.cc
index 00c8210..a94acbd 100644
--- a/content/browser/tab_contents/tab_contents_observer.cc
+++ b/content/browser/tab_contents/tab_contents_observer.cc
@@ -4,7 +4,7 @@
#include "content/browser/tab_contents/tab_contents_observer.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
+#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
TabContentsObserver::TabContentsObserver(TabContents* tab_contents)
diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc
index 4085279..05bcbc5 100644
--- a/content/browser/webui/web_ui.cc
+++ b/content/browser/webui/web_ui.cc
@@ -11,14 +11,14 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/themes/browser_theme_provider.h"
#include "chrome/browser/ui/webui/generic_handler.h"
#include "chrome/common/bindings_policy.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/render_messages_params.h"
+#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_view.h"
namespace {
diff --git a/content/browser/webui/web_ui_handler_browsertest.cc b/content/browser/webui/web_ui_handler_browsertest.cc
index ab580ee..0246afe 100644
--- a/content/browser/webui/web_ui_handler_browsertest.cc
+++ b/content/browser/webui/web_ui_handler_browsertest.cc
@@ -5,8 +5,8 @@
#include "content/browser/webui/web_ui_handler_browsertest.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/test/ui_test_utils.h"
+#include "content/browser/renderer_host/render_view_host.h"
bool WebUIHandlerBrowserTest::Execute(const std::string& js_test) {
web_ui_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(