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