OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 bool state, | 337 bool state, |
338 const string16& head_line, | 338 const string16& head_line, |
339 const string16& description) | 339 const string16& description) |
340 : title_(title), | 340 : title_(title), |
341 state_(state), | 341 state_(state), |
342 head_line_(head_line), | 342 head_line_(head_line), |
343 description_(description) { | 343 description_(description) { |
344 if (!good_state_icon_) { | 344 if (!good_state_icon_) { |
345 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 345 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
346 good_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_GOOD); | 346 good_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_GOOD); |
347 bad_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_BAD); | 347 // The exclamation point has been re-purposed as a warning |
| 348 // signal in the new code. |
| 349 bad_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MAJOR); |
348 } | 350 } |
349 title_label_ = new views::Label(UTF16ToWideHack(title)); | 351 title_label_ = new views::Label(UTF16ToWideHack(title)); |
350 title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 352 title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
351 AddChildView(title_label_); | 353 AddChildView(title_label_); |
352 | 354 |
353 #if defined(OS_WIN) | 355 #if defined(OS_WIN) |
354 separator_ = new views::Separator(); | 356 separator_ = new views::Separator(); |
355 AddChildView(separator_); | 357 AddChildView(separator_); |
356 #else | 358 #else |
357 NOTIMPLEMENTED(); | 359 NOTIMPLEMENTED(); |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 Profile* profile, | 449 Profile* profile, |
448 const GURL& url, | 450 const GURL& url, |
449 const NavigationEntry::SSLStatus& ssl, | 451 const NavigationEntry::SSLStatus& ssl, |
450 bool show_history) { | 452 bool show_history) { |
451 PageInfoWindowView* page_info_window = | 453 PageInfoWindowView* page_info_window = |
452 new PageInfoWindowView(parent, profile, url, ssl, show_history); | 454 new PageInfoWindowView(parent, profile, url, ssl, show_history); |
453 page_info_window->Show(); | 455 page_info_window->Show(); |
454 } | 456 } |
455 | 457 |
456 } | 458 } |
OLD | NEW |