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

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

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: Address comments and really upload the CL :) Created 8 years, 3 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 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 // views::View implementation. 76 // views::View implementation.
77 virtual gfx::Size GetPreferredSize() OVERRIDE; 77 virtual gfx::Size GetPreferredSize() OVERRIDE;
78 78
79 // WebsiteSettingsUI implementations. 79 // WebsiteSettingsUI implementations.
80 virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE; 80 virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE;
81 virtual void SetPermissionInfo( 81 virtual void SetPermissionInfo(
82 const PermissionInfoList& permission_info_list) OVERRIDE; 82 const PermissionInfoList& permission_info_list) OVERRIDE;
83 virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE; 83 virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE;
84 virtual void SetFirstVisit(const string16& first_visit) OVERRIDE; 84 virtual void SetFirstVisit(const string16& first_visit) OVERRIDE;
85 virtual void SetSelectedTab(TabId tab_id) OVERRIDE;
85 86
86 // Creates the contents of the "Permissions" tab. The ownership of the 87 // Creates the contents of the "Permissions" tab. The ownership of the
87 // returned view is transferred to the caller. 88 // returned view is transferred to the caller.
88 views::View* CreatePermissionsTab() WARN_UNUSED_RESULT; 89 views::View* CreatePermissionsTab() WARN_UNUSED_RESULT;
89 90
90 // Creates the contents of the "connection" tab. The ownership of the returned 91 // Creates the contents of the "connection" tab. The ownership of the returned
91 // view is transferred to the caller. 92 // view is transferred to the caller.
92 views::View* CreateConnectionTab() WARN_UNUSED_RESULT; 93 views::View* CreateConnectionTab() WARN_UNUSED_RESULT;
93 94
94 // Each tab contains several sections with a |headline| followed by the 95 // Each tab contains several sections with a |headline| followed by the
(...skipping 20 matching lines...) Expand all
115 // tab. 116 // tab.
116 TabContents* tab_contents_; 117 TabContents* tab_contents_;
117 118
118 // The presenter that controlls the Website Settings UI. 119 // The presenter that controlls the Website Settings UI.
119 scoped_ptr<WebsiteSettings> presenter_; 120 scoped_ptr<WebsiteSettings> presenter_;
120 121
121 PopupHeaderView* header_; // Owned by views hierarchy. 122 PopupHeaderView* header_; // Owned by views hierarchy.
122 123
123 // The |TabbedPane| that contains the tabs of the Website Settings UI. 124 // The |TabbedPane| that contains the tabs of the Website Settings UI.
124 views::TabbedPane* tabbed_pane_; 125 views::TabbedPane* tabbed_pane_;
126 // The view that contains the connection tab contents.
127 views::View* connection_tab_;
125 128
126 // The view that contains the contents of the "Cookies and Site data" section 129 // The view that contains the contents of the "Cookies and Site data" section
127 // from the "Permissions" tab. 130 // from the "Permissions" tab.
128 views::View* site_data_content_; 131 views::View* site_data_content_;
129 // The link that opend the "Cookies" dialog. 132 // The link that opend the "Cookies" dialog.
130 views::Link* cookie_dialog_link_; 133 views::Link* cookie_dialog_link_;
131 // The view that contains the contents of the "Permissions" section from the 134 // The view that contains the contents of the "Permissions" section from the
132 // "Permissions" tab. 135 // "Permissions" tab.
133 views::View* permissions_content_; 136 views::View* permissions_content_;
134 137
135 // The view that contains the ui elements for displaying information about 138 // The view that contains the ui elements for displaying information about
136 // the site's identity. 139 // the site's identity.
137 views::View* identity_info_content_; 140 views::View* identity_info_content_;
138 // The link to open the certificate viewer for displaying the certificate 141 // The link to open the certificate viewer for displaying the certificate
139 // provided by the website. If the site does not provide a certificate then 142 // provided by the website. If the site does not provide a certificate then
140 // |certificate_dialog_link_| is NULL. 143 // |certificate_dialog_link_| is NULL.
141 views::Link* certificate_dialog_link_; 144 views::Link* certificate_dialog_link_;
142 // The id of the certificate provided by the site. If the site does not 145 // The id of the certificate provided by the site. If the site does not
143 // provide a certificate then |cert_id_| is 0. 146 // provide a certificate then |cert_id_| is 0.
144 int cert_id_; 147 int cert_id_;
145 148
146 views::View* connection_info_content_; 149 views::View* connection_info_content_;
147 views::View* page_info_content_; 150 views::View* page_info_content_;
148 151
149 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView); 152 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
150 }; 153 };
151 154
152 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_ H_ 155 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698