| 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 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_ |
| 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_ | 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 // Implements Layer | 27 // Implements Layer |
| 28 scoped_refptr<cc::Layer> layer() override; | 28 scoped_refptr<cc::Layer> layer() override; |
| 29 | 29 |
| 30 void PushResource(ui::ResourceManager::Resource* resource, | 30 void PushResource(ui::ResourceManager::Resource* resource, |
| 31 ui::ResourceManager::Resource* progress_resource, | 31 ui::ResourceManager::Resource* progress_resource, |
| 32 bool anonymize, | 32 bool anonymize, |
| 33 bool anonymize_component_is_incognito, | 33 bool anonymize_component_is_incognito, |
| 34 bool show_debug); | 34 bool show_debug); |
| 35 | 35 |
| 36 // TODO(tedchoc): Remove after migrating downstream to signature that takes | |
| 37 // the progress_resource. | |
| 38 void PushResource(ui::ResourceManager::Resource* resource, | |
| 39 bool anonymize, | |
| 40 bool anonymize_component_is_incognito, | |
| 41 bool show_debug); | |
| 42 | |
| 43 protected: | 36 protected: |
| 44 ToolbarLayer(); | 37 ToolbarLayer(); |
| 45 ~ToolbarLayer() override; | 38 ~ToolbarLayer() override; |
| 46 | 39 |
| 47 private: | 40 private: |
| 48 scoped_refptr<cc::Layer> layer_; | 41 scoped_refptr<cc::Layer> layer_; |
| 49 scoped_refptr<cc::UIResourceLayer> bitmap_layer_; | 42 scoped_refptr<cc::UIResourceLayer> bitmap_layer_; |
| 50 scoped_refptr<cc::UIResourceLayer> progress_layer_; | 43 scoped_refptr<cc::UIResourceLayer> progress_layer_; |
| 51 scoped_refptr<cc::SolidColorLayer> anonymize_layer_; | 44 scoped_refptr<cc::SolidColorLayer> anonymize_layer_; |
| 52 scoped_refptr<cc::SolidColorLayer> debug_layer_; | 45 scoped_refptr<cc::SolidColorLayer> debug_layer_; |
| 53 | 46 |
| 54 DISALLOW_COPY_AND_ASSIGN(ToolbarLayer); | 47 DISALLOW_COPY_AND_ASSIGN(ToolbarLayer); |
| 55 }; | 48 }; |
| 56 | 49 |
| 57 } // namespace android | 50 } // namespace android |
| 58 } // namespace chrome | 51 } // namespace chrome |
| 59 | 52 |
| 60 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_ | 53 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_ |
| OLD | NEW |