OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/browser/web_contents/aura/gesture_nav_simple.h" | 5 #include "content/browser/web_contents/aura/gesture_nav_simple.h" |
6 | 6 |
7 #include "cc/layers/layer.h" | 7 #include "cc/layers/layer.h" |
8 #include "content/browser/frame_host/navigation_controller_impl.h" | 8 #include "content/browser/frame_host/navigation_controller_impl.h" |
9 #include "content/browser/renderer_host/overscroll_controller.h" | 9 #include "content/browser/renderer_host/overscroll_controller.h" |
10 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
11 #include "content/browser/web_contents/web_contents_view.h" | 11 #include "content/browser/web_contents/web_contents_view.h" |
| 12 #include "content/public/browser/browser_thread.h" |
12 #include "content/public/browser/overscroll_configuration.h" | 13 #include "content/public/browser/overscroll_configuration.h" |
13 #include "content/public/common/content_client.h" | 14 #include "content/public/common/content_client.h" |
14 #include "grit/ui_resources.h" | 15 #include "grit/ui_resources.h" |
15 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
16 #include "ui/compositor/layer.h" | 17 #include "ui/compositor/layer.h" |
17 #include "ui/compositor/layer_animation_observer.h" | 18 #include "ui/compositor/layer_animation_observer.h" |
18 #include "ui/compositor/layer_delegate.h" | 19 #include "ui/compositor/layer_delegate.h" |
19 #include "ui/compositor/scoped_layer_animation_settings.h" | 20 #include "ui/compositor/scoped_layer_animation_settings.h" |
20 #include "ui/gfx/animation/tween.h" | 21 #include "ui/gfx/animation/tween.h" |
21 #include "ui/gfx/canvas.h" | 22 #include "ui/gfx/canvas.h" |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 clip_layer_->SetBounds(window->layer()->bounds()); | 223 clip_layer_->SetBounds(window->layer()->bounds()); |
223 clip_layer_->SetMasksToBounds(true); | 224 clip_layer_->SetMasksToBounds(true); |
224 clip_layer_->Add(arrow_.get()); | 225 clip_layer_->Add(arrow_.get()); |
225 | 226 |
226 ui::Layer* parent = window->layer()->parent(); | 227 ui::Layer* parent = window->layer()->parent(); |
227 parent->Add(clip_layer_.get()); | 228 parent->Add(clip_layer_.get()); |
228 parent->StackAtTop(clip_layer_.get()); | 229 parent->StackAtTop(clip_layer_.get()); |
229 } | 230 } |
230 | 231 |
231 } // namespace content | 232 } // namespace content |
OLD | NEW |