| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TOOLBAR_SCENE_LAYER_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TOOLBAR_SCENE_LAYER_H_ |
| 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TOOLBAR_SCENE_LAYER_H_ | 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TOOLBAR_SCENE_LAYER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
| 12 #include "base/android/jni_weak_ref.h" | 12 #include "base/android/jni_weak_ref.h" |
| 13 #include "base/android/scoped_java_ref.h" | 13 #include "base/android/scoped_java_ref.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" | 15 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" |
| 16 #include "ui/android/resources/resource_manager_impl.h" | 16 #include "ui/android/resources/resource_manager_impl.h" |
| 17 | 17 |
| 18 namespace cc { | 18 namespace cc { |
| 19 class Layer; | 19 class Layer; |
| 20 class SolidColorLayer; | |
| 21 } | 20 } |
| 22 | 21 |
| 23 namespace android { | 22 namespace android { |
| 24 | 23 |
| 25 class ToolbarLayer; | 24 class ToolbarLayer; |
| 26 | 25 |
| 27 class ToolbarSceneLayer : public SceneLayer { | 26 class ToolbarSceneLayer : public SceneLayer { |
| 28 public: | 27 public: |
| 29 ToolbarSceneLayer(JNIEnv* env, jobject jobj); | 28 ToolbarSceneLayer(JNIEnv* env, jobject jobj); |
| 30 ~ToolbarSceneLayer() override; | 29 ~ToolbarSceneLayer() override; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 scoped_refptr<ToolbarLayer> toolbar_layer_; | 74 scoped_refptr<ToolbarLayer> toolbar_layer_; |
| 76 | 75 |
| 77 DISALLOW_COPY_AND_ASSIGN(ToolbarSceneLayer); | 76 DISALLOW_COPY_AND_ASSIGN(ToolbarSceneLayer); |
| 78 }; | 77 }; |
| 79 | 78 |
| 80 bool RegisterToolbarSceneLayer(JNIEnv* env); | 79 bool RegisterToolbarSceneLayer(JNIEnv* env); |
| 81 | 80 |
| 82 } // namespace android | 81 } // namespace android |
| 83 | 82 |
| 84 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TOOLBAR_SCENE_LAYER_H_ | 83 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TOOLBAR_SCENE_LAYER_H_ |
| OLD | NEW |