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/website_settings/website_settings_popup_view.h
" | 5 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" |
6 | 6 |
7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/certificate_viewer.h" | 9 #include "chrome/browser/certificate_viewer.h" |
10 #include "chrome/browser/infobars/infobar_service.h" | 10 #include "chrome/browser/infobars/infobar_service.h" |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 layout->StartRow(0, label_column); | 174 layout->StartRow(0, label_column); |
175 name_ = new views::Label(string16()); | 175 name_ = new views::Label(string16()); |
176 gfx::Font headline_font(name_->font().GetFontName(), kIdentityNameFontSize); | 176 gfx::Font headline_font(name_->font().GetFontName(), kIdentityNameFontSize); |
177 name_->SetFont(headline_font.DeriveFont(0, gfx::Font::BOLD)); | 177 name_->SetFont(headline_font.DeriveFont(0, gfx::Font::BOLD)); |
178 layout->AddView(name_, 1, 1, views::GridLayout::LEADING, | 178 layout->AddView(name_, 1, 1, views::GridLayout::LEADING, |
179 views::GridLayout::TRAILING); | 179 views::GridLayout::TRAILING); |
180 views::ImageButton* close_button = | 180 views::ImageButton* close_button = |
181 new views::ImageButton(close_button_listener); | 181 new views::ImageButton(close_button_listener); |
182 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 182 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
183 close_button->SetImage(views::CustomButton::STATE_NORMAL, | 183 close_button->SetImage(views::CustomButton::STATE_NORMAL, |
184 rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia()); | 184 rb.GetImageNamed(IDR_CLOSE_2).ToImageSkia()); |
185 close_button->SetImage(views::CustomButton::STATE_HOVERED, | 185 close_button->SetImage(views::CustomButton::STATE_HOVERED, |
186 rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia()); | 186 rb.GetImageNamed(IDR_CLOSE_2_H).ToImageSkia()); |
187 close_button->SetImage(views::CustomButton::STATE_PRESSED, | 187 close_button->SetImage(views::CustomButton::STATE_PRESSED, |
188 rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia()); | 188 rb.GetImageNamed(IDR_CLOSE_2_P).ToImageSkia()); |
189 layout->AddView(close_button, 1, 1, views::GridLayout::TRAILING, | 189 layout->AddView(close_button, 1, 1, views::GridLayout::TRAILING, |
190 views::GridLayout::LEADING); | 190 views::GridLayout::LEADING); |
191 | 191 |
192 layout->AddPaddingRow(0, kHeaderRowSpacing); | 192 layout->AddPaddingRow(0, kHeaderRowSpacing); |
193 | 193 |
194 layout->StartRow(0, label_column); | 194 layout->StartRow(0, label_column); |
195 status_ = new views::Label(string16()); | 195 status_ = new views::Label(string16()); |
196 layout->AddView(status_, | 196 layout->AddView(status_, |
197 1, | 197 1, |
198 1, | 198 1, |
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 | 742 |
743 if (link) { | 743 if (link) { |
744 content_layout->StartRow(1, 0); | 744 content_layout->StartRow(1, 0); |
745 content_layout->AddView(link); | 745 content_layout->AddView(link); |
746 } | 746 } |
747 | 747 |
748 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, | 748 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, |
749 views::GridLayout::LEADING); | 749 views::GridLayout::LEADING); |
750 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); | 750 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); |
751 } | 751 } |
OLD | NEW |