summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 21:57:00 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 21:57:00 +0000
commitb1829e7e4bd967da34601b1fae5172f7fc457e79 (patch)
tree200f1296993d4be5ac9060ee965ce4e6e26bba71 /chrome/browser/views
parentd106b314c82483aa04d2c638f369dbe3ef4ca82d (diff)
downloadchromium_src-b1829e7e4bd967da34601b1fae5172f7fc457e79.zip
chromium_src-b1829e7e4bd967da34601b1fae5172f7fc457e79.tar.gz
chromium_src-b1829e7e4bd967da34601b1fae5172f7fc457e79.tar.bz2
Revert 18090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/frame/browser_view.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 2a6ea40..2665610 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -134,8 +134,11 @@ class ResizeCorner : public views::View {
}
static gfx::Size GetSize() {
- return gfx::Size(views::NativeScrollBar::GetVerticalScrollBarWidth(),
- views::NativeScrollBar::GetHorizontalScrollBarHeight());
+ // This is disabled until we find what makes us slower when we let
+ // WebKit know that we have a resizer rect...
+ // return gfx::Size(views::NativeScrollBar::GetVerticalScrollBarWidth(),
+ // views::NativeScrollBar::GetHorizontalScrollBarHeight());
+ return gfx::Size();
}
virtual gfx::Size GetPreferredSize() {
@@ -1326,8 +1329,7 @@ void BrowserView::Init() {
#if defined(OS_WIN)
SetProp(GetWidget()->GetNativeView(), kBrowserViewKey, this);
#else
- g_object_set_data(G_OBJECT(GetWidget()->GetNativeView()), kBrowserViewKey,
- this);
+ g_object_set_data(G_OBJECT(GetWidget()->GetNativeView()), kBrowserViewKey, this);
#endif
// Start a hung plugin window detector for this browser object (as long as