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/infobars/infobar_tab_helper.h" | 10 #include "chrome/browser/infobars/infobar_tab_helper.h" |
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 1, | 484 1, |
485 views::GridLayout::USE_PREF, | 485 views::GridLayout::USE_PREF, |
486 0, | 486 0, |
487 0); | 487 0); |
488 for (PermissionInfoList::const_iterator permission = | 488 for (PermissionInfoList::const_iterator permission = |
489 permission_info_list.begin(); | 489 permission_info_list.begin(); |
490 permission != permission_info_list.end(); | 490 permission != permission_info_list.end(); |
491 ++permission) { | 491 ++permission) { |
492 layout->StartRow(1, content_column); | 492 layout->StartRow(1, content_column); |
493 PermissionSelectorView* selector = new PermissionSelectorView( | 493 PermissionSelectorView* selector = new PermissionSelectorView( |
| 494 web_contents_ ? web_contents_->GetURL() : GURL::EmptyGURL(), |
494 permission->type, | 495 permission->type, |
495 permission->default_setting, | 496 permission->default_setting, |
496 permission->setting, | 497 permission->setting, |
497 permission->source); | 498 permission->source); |
498 selector->AddObserver(this); | 499 selector->AddObserver(this); |
499 layout->AddView(selector, | 500 layout->AddView(selector, |
500 1, | 501 1, |
501 1, | 502 1, |
502 views::GridLayout::LEADING, | 503 views::GridLayout::LEADING, |
503 views::GridLayout::CENTER); | 504 views::GridLayout::CENTER); |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
745 | 746 |
746 if (link) { | 747 if (link) { |
747 content_layout->StartRow(1, 0); | 748 content_layout->StartRow(1, 0); |
748 content_layout->AddView(link); | 749 content_layout->AddView(link); |
749 } | 750 } |
750 | 751 |
751 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, | 752 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, |
752 views::GridLayout::LEADING); | 753 views::GridLayout::LEADING); |
753 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); | 754 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); |
754 } | 755 } |
OLD | NEW |