Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 10829452: Auto select the connection tab of the Website Settings UI in case of an https error or mixed content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 ResetConnectionSection( 530 ResetConnectionSection(
531 page_info_content_, 531 page_info_content_,
532 WebsiteSettingsUI::GetFirstVisitIcon(first_visit), 532 WebsiteSettingsUI::GetFirstVisitIcon(first_visit),
533 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE), 533 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE),
534 first_visit, 534 first_visit,
535 NULL); 535 NULL);
536 Layout(); 536 Layout();
537 SizeToContents(); 537 SizeToContents();
538 } 538 }
539 539
540 void WebsiteSettingsPopupView::SetSelectedTab(TabId tab_id) {
541 // TODO(markusheintz): Implement this method.
542 }
543
540 views::View* WebsiteSettingsPopupView::CreatePermissionsTab() { 544 views::View* WebsiteSettingsPopupView::CreatePermissionsTab() {
541 views::View* pane = new views::View(); 545 views::View* pane = new views::View();
542 pane->SetLayoutManager( 546 pane->SetLayoutManager(
543 new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1)); 547 new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
544 // Add cookies and site data section. 548 // Add cookies and site data section.
545 cookie_dialog_link_ = new views::Link( 549 cookie_dialog_link_ = new views::Link(
546 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_SHOW_SITE_DATA)); 550 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_SHOW_SITE_DATA));
547 cookie_dialog_link_->set_listener(this); 551 cookie_dialog_link_->set_listener(this);
548 site_data_content_ = new views::View(); 552 site_data_content_ = new views::View();
549 views::View* site_data_section = 553 views::View* site_data_section =
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 698
695 if (link) { 699 if (link) {
696 content_layout->StartRow(1, 0); 700 content_layout->StartRow(1, 0);
697 content_layout->AddView(link); 701 content_layout->AddView(link);
698 } 702 }
699 703
700 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, 704 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
701 views::GridLayout::LEADING); 705 views::GridLayout::LEADING);
702 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); 706 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
703 } 707 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698