From 9b6f40e8b6954425a76d109eca5c3cb4b84d5afd Mon Sep 17 00:00:00 2001
From: "tc@google.com" <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 11 Jun 2009 15:54:26 +0000
Subject: Move renderer_preferences.h from chrome/browser into chrome/common.
We include the file in chrome/renderer and chrome/browser so to make check
deps happy, I'm putting the file in chrome/common.
Review URL: http://codereview.chromium.org/123001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18166 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/renderer/DEPS | 1 -
chrome/renderer/render_thread.cc | 2 +-
chrome/renderer/render_thread.h | 2 +-
chrome/renderer/render_view.cc | 5 ++---
chrome/renderer/render_view.h | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
(limited to 'chrome/renderer')
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index a1beb11..098bbaa 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -18,6 +18,5 @@ include_rules = [
# FIXME - refactor code and remove these dependencies
"+chrome/browser/net",
"+chrome/views",
- "+chrome/browser",
]
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 2b919ac..1f72aed 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -10,11 +10,11 @@
#include "base/command_line.h"
#include "base/shared_memory.h"
#include "base/stats_table.h"
-#include "chrome/browser/renderer_preferences.h"
#include "chrome/common/app_cache/app_cache_context_impl.h"
#include "chrome/common/app_cache/app_cache_dispatcher.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/render_messages.h"
+#include "chrome/common/renderer_preferences.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/url_constants.h"
#include "chrome/plugin/npobject_util.h"
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 36cef3a..56be75e 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -12,7 +12,6 @@
#include "base/shared_memory.h"
#include "base/task.h"
#include "build/build_config.h"
-#include "chrome/browser/renderer_preferences.h"
#include "chrome/common/child_thread.h"
#include "chrome/renderer/renderer_histogram_snapshots.h"
@@ -27,6 +26,7 @@ class SkBitmap;
class UserScriptSlave;
class VisitedLinkSlave;
struct ModalDialogEvent;
+struct RendererPreferences;
struct WebPreferences;
// The RenderThreadBase is the minimal interface that a RenderView/Widget
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 13876ec..59155ed8 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -21,13 +21,13 @@
#include "base/string_piece.h"
#include "base/string_util.h"
#include "build/build_config.h"
-#include "chrome/browser/renderer_preferences.h"
#include "chrome/common/bindings_policy.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/page_zoom.h"
#include "chrome/common/render_messages.h"
+#include "chrome/common/renderer_preferences.h"
#include "chrome/common/thumbnail_score.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/about_handler.h"
@@ -194,8 +194,7 @@ RenderView::RenderView(RenderThreadBase* render_thread)
popup_notification_visible_(false),
delay_seconds_for_form_state_sync_(kDefaultDelaySecondsForFormStateSync),
preferred_width_(0),
- send_preferred_width_changes_(false),
- renderer_preferences_(*(new RendererPreferences)) {
+ send_preferred_width_changes_(false) {
}
RenderView::~RenderView() {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index f661b02..ac315f5 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -18,7 +18,7 @@
#include "base/timer.h"
#include "base/values.h"
#include "build/build_config.h"
-#include "chrome/browser/renderer_preferences.h"
+#include "chrome/common/renderer_preferences.h"
#include "chrome/renderer/automation/dom_automation_controller.h"
#include "chrome/renderer/dom_ui_bindings.h"
#include "chrome/renderer/extensions/extension_process_bindings.h"
--
cgit v1.1