| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/touch/touch_observer_hud.h" | 5 #include "ash/touch/touch_observer_hud.h" |
| 6 | 6 |
| 7 #include "ash/shell_window_ids.h" | 7 #include "ash/shell_window_ids.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "third_party/skia/include/core/SkPath.h" | 10 #include "third_party/skia/include/core/SkPath.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 touch_labels_[event->touch_id()]->SetVisible(true); | 208 touch_labels_[event->touch_id()]->SetVisible(true); |
| 209 UpdateTouchPointLabel(event->touch_id()); | 209 UpdateTouchPointLabel(event->touch_id()); |
| 210 | 210 |
| 211 widget_->SetSize(widget_->GetContentsView()->GetPreferredSize()); | 211 widget_->SetSize(widget_->GetContentsView()->GetPreferredSize()); |
| 212 | 212 |
| 213 return ui::TOUCH_STATUS_UNKNOWN; | 213 return ui::TOUCH_STATUS_UNKNOWN; |
| 214 } | 214 } |
| 215 | 215 |
| 216 ui::GestureStatus TouchObserverHUD::PreHandleGestureEvent( | 216 ui::GestureStatus TouchObserverHUD::PreHandleGestureEvent( |
| 217 aura::Window* target, | 217 aura::Window* target, |
| 218 ui::GestureEventImpl* event) { | 218 ui::GestureEvent* event) { |
| 219 return ui::GESTURE_STATUS_UNKNOWN; | 219 return ui::GESTURE_STATUS_UNKNOWN; |
| 220 } | 220 } |
| 221 | 221 |
| 222 void TouchObserverHUD::OnWidgetClosing(views::Widget* widget) { | 222 void TouchObserverHUD::OnWidgetClosing(views::Widget* widget) { |
| 223 DCHECK_EQ(widget, widget_); | 223 DCHECK_EQ(widget, widget_); |
| 224 widget_ = NULL; | 224 widget_ = NULL; |
| 225 } | 225 } |
| 226 | 226 |
| 227 } // namespace internal | 227 } // namespace internal |
| 228 } // namespace ash | 228 } // namespace ash |
| OLD | NEW |