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 "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
10 #include "cc/layers/layer_collections.h" | 10 #include "cc/layers/layer_collections.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 // Update Resource Ids For Layers That Impact Layout | 227 // Update Resource Ids For Layers That Impact Layout |
228 //-------------------------------------------------------------------------- | 228 //-------------------------------------------------------------------------- |
229 | 229 |
230 // TODO(kkimlabs): Tab switcher doesn't show the progress bar. | 230 // TODO(kkimlabs): Tab switcher doesn't show the progress bar. |
231 toolbar_layer_->PushResource(toolbar_resource_id, | 231 toolbar_layer_->PushResource(toolbar_resource_id, |
232 toolbar_background_color, | 232 toolbar_background_color, |
233 anonymize_toolbar, | 233 anonymize_toolbar, |
234 toolbar_textbox_background_color, | 234 toolbar_textbox_background_color, |
235 toolbar_textbox_resource_id, | 235 toolbar_textbox_resource_id, |
236 toolbar_textbox_alpha, | 236 toolbar_textbox_alpha, |
| 237 view_height, |
237 false, | 238 false, |
238 false); | 239 false); |
239 toolbar_layer_->UpdateProgressBar(0, 0, 0, 0, 0, 0, 0, 0, 0, 0); | 240 toolbar_layer_->UpdateProgressBar(0, 0, 0, 0, 0, 0, 0, 0, 0, 0); |
240 | 241 |
241 float toolbar_impact_height = 0; | 242 float toolbar_impact_height = 0; |
242 if (show_toolbar && !back_visible) | 243 if (show_toolbar && !back_visible) |
243 toolbar_impact_height = toolbar_layer_->layer()->bounds().height(); | 244 toolbar_impact_height = toolbar_layer_->layer()->bounds().height(); |
244 | 245 |
245 //---------------------------------------------------------------------------- | 246 //---------------------------------------------------------------------------- |
246 // Compute Alpha and Visibility | 247 // Compute Alpha and Visibility |
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
676 title_->RemoveAllChildren(); | 677 title_->RemoveAllChildren(); |
677 title_->AddChild(layer); | 678 title_->AddChild(layer); |
678 } | 679 } |
679 } | 680 } |
680 | 681 |
681 if (title) | 682 if (title) |
682 title->SetUIResourceIds(); | 683 title->SetUIResourceIds(); |
683 } | 684 } |
684 | 685 |
685 } // namespace android | 686 } // namespace android |
OLD | NEW |