summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/find_bar_host.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 19:41:41 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 19:41:41 +0000
commit2629d65a605e07b47287af311f85c978c0e009c7 (patch)
tree659a0173a376d52a57f8adfeeada179ef314a1fa /chrome/browser/views/find_bar_host.cc
parent961c3ee9e2f89148b9e001ea116e90b5b68681a4 (diff)
downloadchromium_src-2629d65a605e07b47287af311f85c978c0e009c7.zip
chromium_src-2629d65a605e07b47287af311f85c978c0e009c7.tar.gz
chromium_src-2629d65a605e07b47287af311f85c978c0e009c7.tar.bz2
Change most callers of NativeScrollbar size functions to use a dedicated function that matches WebKit instead, since the callers really care about content area scrollbars.
BUG=none TEST=none Review URL: http://codereview.chromium.org/463061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/find_bar_host.cc')
-rw-r--r--chrome/browser/views/find_bar_host.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/views/find_bar_host.cc b/chrome/browser/views/find_bar_host.cc
index dd8622a..bc81cda 100644
--- a/chrome/browser/views/find_bar_host.cc
+++ b/chrome/browser/views/find_bar_host.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/views/find_bar_host.h"
#include "app/gfx/path.h"
+#include "app/gfx/scrollbar_size.h"
#include "app/slide_animation.h"
#include "base/keyboard_codes.h"
#include "base/scoped_handle.h"
@@ -19,7 +20,6 @@
#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "views/focus/external_focus_tracker.h"
#include "views/focus/view_storage.h"
-#include "views/controls/scrollbar/native_scroll_bar.h"
#include "views/widget/root_view.h"
#include "views/widget/widget.h"
@@ -218,10 +218,8 @@ void FindBarHost::UpdateWindowEdges(const gfx::Rect& new_pos) {
// TODO(brettw) this constant is evil. This is the amount of room we've added
// to the window size, when we set the region, it can change the size.
static const int kAddedWidth = 7;
- int difference = (new_pos.right() - kAddedWidth) -
- widget_bounds.width() -
- views::NativeScrollBar::GetVerticalScrollBarWidth() +
- 1;
+ int difference = new_pos.right() - kAddedWidth - widget_bounds.width() -
+ gfx::scrollbar_size() + 1;
if (difference > 0) {
Path::Point exclude[4];
exclude[0].x = max_x - difference; // Top left corner.