| Index: chrome/browser/android/compositor/layer/toolbar_layer.h
|
| diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.h b/chrome/browser/android/compositor/layer/toolbar_layer.h
|
| index ab9f93124a69856e7ff3cf19fc65d31f1ef1363f..5da318e5c8f22e45bfe5413802df74d33f1e73a3 100644
|
| --- a/chrome/browser/android/compositor/layer/toolbar_layer.h
|
| +++ b/chrome/browser/android/compositor/layer/toolbar_layer.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/layers/nine_patch_layer.h"
|
| #include "chrome/browser/android/compositor/layer/layer.h"
|
| #include "ui/android/resources/resource_manager.h"
|
|
|
| @@ -22,17 +23,21 @@ namespace android {
|
|
|
| class ToolbarLayer : public Layer {
|
| public:
|
| - static scoped_refptr<ToolbarLayer> Create();
|
| + static scoped_refptr<ToolbarLayer> Create(
|
| + ui::ResourceManager* resource_manager);
|
|
|
| // Implements Layer
|
| scoped_refptr<cc::Layer> layer() override;
|
|
|
| - void PushResource(ui::ResourceManager::Resource* resource,
|
| + void PushResource(int toolbar_resource_id,
|
| int toolbar_background_color,
|
| bool anonymize,
|
| int toolbar_textbox_background_color,
|
| + int url_bar_background_resource_id,
|
| + float url_bar_alpha,
|
| bool show_debug,
|
| - float brightness);
|
| + float brightness,
|
| + bool clip_shadow);
|
|
|
| void UpdateProgressBar(int progress_bar_x,
|
| int progress_bar_y,
|
| @@ -46,12 +51,15 @@ class ToolbarLayer : public Layer {
|
| int progress_bar_background_color);
|
|
|
| protected:
|
| - ToolbarLayer();
|
| + explicit ToolbarLayer(ui::ResourceManager* resource_manager);
|
| ~ToolbarLayer() override;
|
|
|
| private:
|
| + ui::ResourceManager* resource_manager_;
|
| +
|
| scoped_refptr<cc::Layer> layer_;
|
| scoped_refptr<cc::SolidColorLayer> toolbar_background_layer_;
|
| + scoped_refptr<cc::NinePatchLayer> url_bar_background_layer_;
|
| scoped_refptr<cc::UIResourceLayer> bitmap_layer_;
|
| scoped_refptr<cc::SolidColorLayer> progress_bar_layer_;
|
| scoped_refptr<cc::SolidColorLayer> progress_bar_background_layer_;
|
|
|