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/string_number_conversions.h" | 7 #include "base/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/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 0, | 455 0, |
456 0); | 456 0); |
457 for (PermissionInfoList::const_iterator permission = | 457 for (PermissionInfoList::const_iterator permission = |
458 permission_info_list.begin(); | 458 permission_info_list.begin(); |
459 permission != permission_info_list.end(); | 459 permission != permission_info_list.end(); |
460 ++permission) { | 460 ++permission) { |
461 layout->StartRow(1, content_column); | 461 layout->StartRow(1, content_column); |
462 PermissionSelectorView* selector = new PermissionSelectorView( | 462 PermissionSelectorView* selector = new PermissionSelectorView( |
463 permission->type, | 463 permission->type, |
464 permission->default_setting, | 464 permission->default_setting, |
465 permission->setting); | 465 permission->setting, |
| 466 permission->source); |
466 selector->AddObserver(this); | 467 selector->AddObserver(this); |
467 layout->AddView(selector, | 468 layout->AddView(selector, |
468 1, | 469 1, |
469 1, | 470 1, |
470 views::GridLayout::LEADING, | 471 views::GridLayout::LEADING, |
471 views::GridLayout::CENTER); | 472 views::GridLayout::CENTER); |
472 layout->AddPaddingRow(1, kPermissionsSectionRowSpacing); | 473 layout->AddPaddingRow(1, kPermissionsSectionRowSpacing); |
473 } | 474 } |
474 | 475 |
475 SizeToContents(); | 476 SizeToContents(); |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
694 | 695 |
695 if (link) { | 696 if (link) { |
696 content_layout->StartRow(1, 0); | 697 content_layout->StartRow(1, 0); |
697 content_layout->AddView(link); | 698 content_layout->AddView(link); |
698 } | 699 } |
699 | 700 |
700 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, | 701 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, |
701 views::GridLayout::LEADING); | 702 views::GridLayout::LEADING); |
702 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); | 703 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); |
703 } | 704 } |
OLD | NEW |