Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Side by Side Diff: chrome/browser/android/compositor/layer/toolbar_layer.h

Issue 2417323002: Move composited toolbar to bottom of screen when Chrome Home is enabled (Closed)
Patch Set: move flag to initializer list Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 17 matching lines...) Expand all
28 28
29 // Implements Layer 29 // Implements Layer
30 scoped_refptr<cc::Layer> layer() override; 30 scoped_refptr<cc::Layer> layer() override;
31 31
32 void PushResource(int toolbar_resource_id, 32 void PushResource(int toolbar_resource_id,
33 int toolbar_background_color, 33 int toolbar_background_color,
34 bool anonymize, 34 bool anonymize,
35 int toolbar_textbox_background_color, 35 int toolbar_textbox_background_color,
36 int url_bar_background_resource_id, 36 int url_bar_background_resource_id,
37 float url_bar_alpha, 37 float url_bar_alpha,
38 float view_height,
38 bool show_debug, 39 bool show_debug,
39 bool clip_shadow); 40 bool clip_shadow);
40 41
41 void UpdateProgressBar(int progress_bar_x, 42 void UpdateProgressBar(int progress_bar_x,
42 int progress_bar_y, 43 int progress_bar_y,
43 int progress_bar_width, 44 int progress_bar_width,
44 int progress_bar_height, 45 int progress_bar_height,
45 int progress_bar_color, 46 int progress_bar_color,
46 int progress_bar_background_x, 47 int progress_bar_background_x,
47 int progress_bar_background_y, 48 int progress_bar_background_y,
48 int progress_bar_background_width, 49 int progress_bar_background_width,
49 int progress_bar_background_height, 50 int progress_bar_background_height,
50 int progress_bar_background_color); 51 int progress_bar_background_color);
51 52
52 protected: 53 protected:
53 explicit ToolbarLayer(ui::ResourceManager* resource_manager); 54 explicit ToolbarLayer(ui::ResourceManager* resource_manager);
54 ~ToolbarLayer() override; 55 ~ToolbarLayer() override;
55 56
56 private: 57 private:
58 bool is_chrome_home_enabled_;
59
57 ui::ResourceManager* resource_manager_; 60 ui::ResourceManager* resource_manager_;
58 61
59 scoped_refptr<cc::Layer> layer_; 62 scoped_refptr<cc::Layer> layer_;
63 scoped_refptr<cc::Layer> toolbar_root_;
60 scoped_refptr<cc::SolidColorLayer> toolbar_background_layer_; 64 scoped_refptr<cc::SolidColorLayer> toolbar_background_layer_;
61 scoped_refptr<cc::NinePatchLayer> url_bar_background_layer_; 65 scoped_refptr<cc::NinePatchLayer> url_bar_background_layer_;
62 scoped_refptr<cc::UIResourceLayer> bitmap_layer_; 66 scoped_refptr<cc::UIResourceLayer> bitmap_layer_;
63 scoped_refptr<cc::SolidColorLayer> progress_bar_layer_; 67 scoped_refptr<cc::SolidColorLayer> progress_bar_layer_;
64 scoped_refptr<cc::SolidColorLayer> progress_bar_background_layer_; 68 scoped_refptr<cc::SolidColorLayer> progress_bar_background_layer_;
65 scoped_refptr<cc::SolidColorLayer> anonymize_layer_; 69 scoped_refptr<cc::SolidColorLayer> anonymize_layer_;
66 scoped_refptr<cc::SolidColorLayer> debug_layer_; 70 scoped_refptr<cc::SolidColorLayer> debug_layer_;
67 71
68 DISALLOW_COPY_AND_ASSIGN(ToolbarLayer); 72 DISALLOW_COPY_AND_ASSIGN(ToolbarLayer);
69 }; 73 };
70 74
71 } // namespace android 75 } // namespace android
72 76
73 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_ 77 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/compositor/layer/tab_layer.cc ('k') | chrome/browser/android/compositor/layer/toolbar_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698