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/wm/gestures/long_press_affordance_handler.h" | 5 #include "ash/wm/gestures/long_press_affordance_handler.h" |
6 | 6 |
7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
11 #include "ash/wm/property_util.h" | |
12 #include "third_party/skia/include/core/SkColor.h" | 11 #include "third_party/skia/include/core/SkColor.h" |
13 #include "third_party/skia/include/core/SkPaint.h" | 12 #include "third_party/skia/include/core/SkPaint.h" |
14 #include "third_party/skia/include/core/SkPath.h" | 13 #include "third_party/skia/include/core/SkPath.h" |
15 #include "third_party/skia/include/core/SkRect.h" | 14 #include "third_party/skia/include/core/SkRect.h" |
16 #include "third_party/skia/include/effects/SkGradientShader.h" | 15 #include "third_party/skia/include/effects/SkGradientShader.h" |
17 #include "ui/aura/client/screen_position_client.h" | 16 #include "ui/aura/client/screen_position_client.h" |
18 #include "ui/aura/root_window.h" | 17 #include "ui/aura/root_window.h" |
19 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
20 #include "ui/base/gestures/gesture_configuration.h" | 19 #include "ui/base/gestures/gesture_configuration.h" |
21 #include "ui/base/gestures/gesture_util.h" | 20 #include "ui/base/gestures/gesture_util.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
62 views::Widget* widget = new views::Widget; | 61 views::Widget* widget = new views::Widget; |
63 views::Widget::InitParams params; | 62 views::Widget::InitParams params; |
64 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; | 63 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; |
65 params.keep_on_top = true; | 64 params.keep_on_top = true; |
66 params.accept_events = false; | 65 params.accept_events = false; |
67 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 66 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
68 params.context = root_window; | 67 params.context = root_window; |
69 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 68 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
70 widget->Init(params); | 69 widget->Init(params); |
71 widget->SetOpacity(0xFF); | 70 widget->SetOpacity(0xFF); |
72 ash::GetRootWindowController(root_window)->GetContainer( | 71 ash::internal::GetRootWindowController(root_window)->GetContainer( |
Daniel Erat
2013/09/06 01:00:35
nit: any reason not to move this anon namespace in
oshima
2013/09/06 01:11:06
Agreed. done.
| |
73 ash::internal::kShellWindowId_OverlayContainer)->AddChild( | 72 ash::internal::kShellWindowId_OverlayContainer)->AddChild( |
74 widget->GetNativeWindow()); | 73 widget->GetNativeWindow()); |
75 return widget; | 74 return widget; |
76 } | 75 } |
77 | 76 |
78 void PaintAffordanceArc(gfx::Canvas* canvas, | 77 void PaintAffordanceArc(gfx::Canvas* canvas, |
79 gfx::Point& center, | 78 gfx::Point& center, |
80 int radius, | 79 int radius, |
81 int start_angle, | 80 int start_angle, |
82 int end_angle) { | 81 int end_angle) { |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
368 default: | 367 default: |
369 view_.reset(); | 368 view_.reset(); |
370 tap_down_touch_id_ = -1; | 369 tap_down_touch_id_ = -1; |
371 tap_down_display_id_ = 0; | 370 tap_down_display_id_ = 0; |
372 break; | 371 break; |
373 } | 372 } |
374 } | 373 } |
375 | 374 |
376 } // namespace internal | 375 } // namespace internal |
377 } // namespace ash | 376 } // namespace ash |
OLD | NEW |