summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 21:40:32 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 21:40:32 +0000
commit93623c5d8fd1847dc31b67ed15779a3267a78d97 (patch)
treee311599b977576d6b94ab47829ccfffcbaaf9fad /chrome/browser/extensions
parent9fb89471331ec0b7fad12ffafa505aa6b8425fa5 (diff)
downloadchromium_src-93623c5d8fd1847dc31b67ed15779a3267a78d97.zip
chromium_src-93623c5d8fd1847dc31b67ed15779a3267a78d97.tar.gz
chromium_src-93623c5d8fd1847dc31b67ed15779a3267a78d97.tar.bz2
re-apply r34183
--------------- linux: theme scrollbars from GTK theme Pick the color of the slider's thumbpart and rail from the GTK theme. We cannot match the exact visual appearance of the GTK theme, as rendering engines can make arbitrary changes to the actual visual appearance. But by sampling a representative set of pixels, we ensure that we will at least match the general color scheme. BUG=10949 patch by <markus [at] chromium> original review: http://codereview.chromium.org/400027/show Review URL: http://codereview.chromium.org/479006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_host.cc6
-rw-r--r--chrome/browser/extensions/extension_host.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 5313852..767da27 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -27,12 +27,12 @@
#include "chrome/browser/renderer_host/render_widget_host.h"
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/renderer_host/site_instance.h"
+#include "chrome/browser/renderer_preferences_util.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/bindings_policy.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/notification_service.h"
-#include "chrome/common/platform_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
#include "chrome/common/view_types.h"
@@ -415,8 +415,8 @@ void ExtensionHost::Close(RenderViewHost* render_view_host) {
}
}
-RendererPreferences ExtensionHost::GetRendererPrefs() const {
- return platform_util::GetInitedRendererPreferences();
+RendererPreferences ExtensionHost::GetRendererPrefs(Profile* profile) const {
+ return renderer_preferences_util::GetInitedRendererPreferences(profile);
}
WebPreferences ExtensionHost::GetWebkitPrefs() {
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index a743218d..5f2188c 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -122,7 +122,7 @@ class ExtensionHost : public ExtensionPopupHost::PopupDelegate,
IPC::Message* reply_msg,
bool* did_suppress_message);
virtual void Close(RenderViewHost* render_view_host);
- virtual RendererPreferences GetRendererPrefs() const;
+ virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
// RenderViewHostDelegate::View
virtual void CreateNewWindow(int route_id);