From 578d1219cf25d4ba253322fdf790bf89dd509969 Mon Sep 17 00:00:00 2001 From: "dhollowa@chromium.org" Date: Thu, 12 Jan 2012 21:21:48 +0000 Subject: Revert 117499 - 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 TBR=dhollowa@chromium.org Review URL: http://codereview.chromium.org/9186049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117502 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/aura/client/drag_drop_delegate.cc | 4 ++-- ui/views/controls/button/text_button.h | 4 ++-- ui/views/controls/scrollbar/base_scroll_bar_button.cc | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'ui') diff --git a/ui/aura/client/drag_drop_delegate.cc b/ui/aura/client/drag_drop_delegate.cc index c9f4e88..1cc75f6 100644 --- a/ui/aura/client/drag_drop_delegate.cc +++ b/ui/aura/client/drag_drop_delegate.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -21,4 +21,4 @@ DragDropDelegate* GetDragDropDelegate(Window* window) { } } // namespace client -} // namespace aura +} // namespace aura \ No newline at end of file diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h index 7b1f447..5214654 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 class for different types of buttons, like push buttons, radio -// buttons, and checkboxes, that do not depend on native components for +// A base ckass for different types of buttons, like push buttons, radio +// buttons, and checkboxes, that do not depende 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 e78c13b..5efef6e 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) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,12 +34,11 @@ void BaseScrollBarButton::OnMouseCaptureLost() { } void BaseScrollBarButton::RepeaterNotifyClick() { - // TODO(sky): See if we can convert to using |Screen| everywhere. -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(OS_WIN) DWORD pos = GetMessagePos(); POINTS points = MAKEPOINTS(pos); gfx::Point cursor_point(points.x, points.y); -#else +#elif defined(OS_LINUX) gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint(); #endif views::MouseEvent event(ui::ET_MOUSE_RELEASED, -- cgit v1.1