| 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 "base/macros.h" |
| 7 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
| 8 #include "content/browser/frame_host/navigation_controller_impl.h" | 9 #include "content/browser/frame_host/navigation_controller_impl.h" |
| 9 #include "content/browser/renderer_host/overscroll_controller.h" | 10 #include "content/browser/renderer_host/overscroll_controller.h" |
| 10 #include "content/browser/web_contents/web_contents_impl.h" | 11 #include "content/browser/web_contents/web_contents_impl.h" |
| 11 #include "content/browser/web_contents/web_contents_view.h" | 12 #include "content/browser/web_contents/web_contents_view.h" |
| 12 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
| 13 #include "content/public/browser/overscroll_configuration.h" | 14 #include "content/public/browser/overscroll_configuration.h" |
| 14 #include "content/public/common/content_client.h" | 15 #include "content/public/common/content_client.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" |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 clip_layer_->SetBounds(window->layer()->bounds()); | 231 clip_layer_->SetBounds(window->layer()->bounds()); |
| 231 clip_layer_->SetMasksToBounds(true); | 232 clip_layer_->SetMasksToBounds(true); |
| 232 clip_layer_->Add(arrow_.get()); | 233 clip_layer_->Add(arrow_.get()); |
| 233 | 234 |
| 234 ui::Layer* parent = window->layer()->parent(); | 235 ui::Layer* parent = window->layer()->parent(); |
| 235 parent->Add(clip_layer_.get()); | 236 parent->Add(clip_layer_.get()); |
| 236 parent->StackAtTop(clip_layer_.get()); | 237 parent->StackAtTop(clip_layer_.get()); |
| 237 } | 238 } |
| 238 | 239 |
| 239 } // namespace content | 240 } // namespace content |
| OLD | NEW |