| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/dropdown_bar_view.h" | 5 #include "chrome/browser/ui/views/dropdown_bar_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/themes/theme_service.h" | 7 #include "chrome/browser/themes/theme_service.h" |
| 8 #include "chrome/browser/ui/view_ids.h" | 8 #include "chrome/browser/ui/view_ids.h" |
| 9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 | 124 |
| 125 //////////////////////////////////////////////////////////////////////////////// | 125 //////////////////////////////////////////////////////////////////////////////// |
| 126 // DropDownBarView, protected: | 126 // DropDownBarView, protected: |
| 127 | 127 |
| 128 void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask, | 128 void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask, |
| 129 const gfx::ImageSkia* right_alpha_mask) { | 129 const gfx::ImageSkia* right_alpha_mask) { |
| 130 set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask, | 130 set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask, |
| 131 right_alpha_mask)); | 131 right_alpha_mask)); |
| 132 } | 132 } |
| 133 | 133 |
| 134 void DropdownBarView::SetBorder(int left_border_image_id, | 134 void DropdownBarView::SetBorderFromIds(int left_border_image_id, |
| 135 int middle_border_image_id, | 135 int middle_border_image_id, |
| 136 int right_border_image_id) { | 136 int right_border_image_id) { |
| 137 int border_image_ids[3] = {left_border_image_id, middle_border_image_id, | 137 int border_image_ids[3] = {left_border_image_id, middle_border_image_id, |
| 138 right_border_image_id}; | 138 right_border_image_id}; |
| 139 set_border(views::Border::CreateBorderPainter( | 139 SetBorder(views::Border::CreateBorderPainter( |
| 140 new views::HorizontalPainter(border_image_ids), gfx::Insets())); | 140 new views::HorizontalPainter(border_image_ids), gfx::Insets())); |
| 141 } | 141 } |
| OLD | NEW |