| 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 "chrome/browser/android/compositor/layer/tab_layer.h" | 5 #include "chrome/browser/android/compositor/layer/tab_layer.h" |
| 6 | 6 |
| 7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
| 8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
| 9 #include "cc/layers/layer_lists.h" | 9 #include "cc/layers/layer_lists.h" |
| 10 #include "cc/layers/nine_patch_layer.h" | 10 #include "cc/layers/nine_patch_layer.h" |
| 11 #include "cc/layers/solid_color_layer.h" | 11 #include "cc/layers/solid_color_layer.h" |
| 12 #include "cc/layers/ui_resource_layer.h" | 12 #include "cc/layers/ui_resource_layer.h" |
| 13 #include "cc/resources/scoped_ui_resource.h" |
| 13 #include "chrome/browser/android/compositor/decoration_title.h" | 14 #include "chrome/browser/android/compositor/decoration_title.h" |
| 14 #include "chrome/browser/android/compositor/layer/content_layer.h" | 15 #include "chrome/browser/android/compositor/layer/content_layer.h" |
| 15 #include "chrome/browser/android/compositor/layer/toolbar_layer.h" | 16 #include "chrome/browser/android/compositor/layer/toolbar_layer.h" |
| 16 #include "chrome/browser/android/compositor/layer_title_cache.h" | 17 #include "chrome/browser/android/compositor/layer_title_cache.h" |
| 17 #include "chrome/browser/android/compositor/tab_content_manager.h" | 18 #include "chrome/browser/android/compositor/tab_content_manager.h" |
| 18 #include "content/public/browser/android/compositor.h" | 19 #include "content/public/browser/android/compositor.h" |
| 19 #include "ui/android/resources/resource_manager.h" | 20 #include "ui/android/resources/resource_manager.h" |
| 20 #include "ui/android/resources/ui_resource_android.h" | |
| 21 #include "ui/base/l10n/l10n_util_android.h" | 21 #include "ui/base/l10n/l10n_util_android.h" |
| 22 #include "ui/gfx/geometry/insets_f.h" | 22 #include "ui/gfx/geometry/insets_f.h" |
| 23 #include "ui/gfx/geometry/point_f.h" | 23 #include "ui/gfx/geometry/point_f.h" |
| 24 #include "ui/gfx/geometry/rect_f.h" | 24 #include "ui/gfx/geometry/rect_f.h" |
| 25 #include "ui/gfx/geometry/safe_integer_conversions.h" | 25 #include "ui/gfx/geometry/safe_integer_conversions.h" |
| 26 #include "ui/gfx/geometry/size.h" | 26 #include "ui/gfx/geometry/size.h" |
| 27 #include "ui/gfx/transform.h" | 27 #include "ui/gfx/transform.h" |
| 28 | 28 |
| 29 namespace chrome { | 29 namespace chrome { |
| 30 namespace android { | 30 namespace android { |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 587 title_->AddChild(layer); | 587 title_->AddChild(layer); |
| 588 } | 588 } |
| 589 } | 589 } |
| 590 | 590 |
| 591 if (title) | 591 if (title) |
| 592 title->SetUIResourceIds(); | 592 title->SetUIResourceIds(); |
| 593 } | 593 } |
| 594 | 594 |
| 595 } // namespace android | 595 } // namespace android |
| 596 } // namespace chrome | 596 } // namespace chrome |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1371523003:
Android: Don't destroy LayerTreeHost when Surface goes away (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master