diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 21:03:21 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 21:03:21 +0000 |
| commit | 40e7e3cade97b9f9f8f9f0ca3286a5fb9cdc0b28 (patch) | |
| tree | 85456fd147de02c70076b9967178d0f7e622c25b /ui/views | |
| parent | bb39652589a723b1d2f9a68fddfb3ae111f2c9d3 (diff) | |
| download | chromium_src-40e7e3cade97b9f9f8f9f0ca3286a5fb9cdc0b28.zip chromium_src-40e7e3cade97b9f9f8f9f0ca3286a5fb9cdc0b28.tar.gz chromium_src-40e7e3cade97b9f9f8f9f0ca3286a5fb9cdc0b28.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
Review URL: http://codereview.chromium.org/9197005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/controls/button/text_button.h | 4 | ||||
| -rw-r--r-- | ui/views/controls/scrollbar/base_scroll_bar_button.cc | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h index 5214654..7b1f447 100644 --- a/ui/views/controls/button/text_button.h +++ b/ui/views/controls/button/text_button.h @@ -111,8 +111,8 @@ class VIEWS_EXPORT TextButtonNativeThemeBorder : public Border { // // TextButtonBase // -// A base ckass for different types of buttons, like push buttons, radio -// buttons, and checkboxes, that do not depende on native components for +// A base class for different types of buttons, like push buttons, radio +// buttons, and checkboxes, that do not depend on native components for // look and feel. TextButton reserves space for the largest string // passed to SetText. To reset the cached max size invoke ClearMaxTextSize. // diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.cc b/ui/views/controls/scrollbar/base_scroll_bar_button.cc index 5efef6e..e78c13b 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. @@ -34,11 +34,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, |