diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 00:27:55 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 00:27:55 +0000 |
| commit | cd221353926b9155feb6a32dad7a61cdfd0908eb (patch) | |
| tree | 5ab079fbc7f1491d1b649cb0e0d9dab28c080105 /ui/views/controls/scrollbar | |
| parent | fa8cfb0369dc6f6b7470d1163773709d876b0845 (diff) | |
| download | chromium_src-cd221353926b9155feb6a32dad7a61cdfd0908eb.zip chromium_src-cd221353926b9155feb6a32dad7a61cdfd0908eb.tar.gz chromium_src-cd221353926b9155feb6a32dad7a61cdfd0908eb.tar.bz2 | |
Aura compile issues under clang
Fixes misc clang/style errors for Aura sources. This should be the last
of them.
BUG=109946
TEST=Compiles under mac/clang.
R=sky@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117499
Review URL: http://codereview.chromium.org/9197005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/scrollbar')
| -rw-r--r-- | ui/views/controls/scrollbar/base_scroll_bar_button.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.cc b/ui/views/controls/scrollbar/base_scroll_bar_button.cc index 5efef6e..d061e58 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_button.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar_button.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "ui/gfx/screen.h" namespace views { @@ -34,11 +35,12 @@ void BaseScrollBarButton::OnMouseCaptureLost() { } void BaseScrollBarButton::RepeaterNotifyClick() { -#if defined(OS_WIN) + // TODO(sky): See if we can convert to using |Screen| everywhere. +#if defined(OS_WIN) && !defined(USE_AURA) DWORD pos = GetMessagePos(); POINTS points = MAKEPOINTS(pos); gfx::Point cursor_point(points.x, points.y); -#elif defined(OS_LINUX) +#else gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint(); #endif views::MouseEvent event(ui::ET_MOUSE_RELEASED, |