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

Side by Side Diff: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h

Issue 2107123002: Convert OSX Page Info Bubble to Material Design (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Layout fixes. Created 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 15 matching lines...) Expand all
26 // to OriginInfo*. 26 // to OriginInfo*.
27 @interface WebsiteSettingsBubbleController : BaseBubbleController { 27 @interface WebsiteSettingsBubbleController : BaseBubbleController {
28 @private 28 @private
29 content::WebContents* webContents_; 29 content::WebContents* webContents_;
30 30
31 base::scoped_nsobject<NSView> contentView_; 31 base::scoped_nsobject<NSView> contentView_;
32 32
33 // The main content view for the Permissions tab. 33 // The main content view for the Permissions tab.
34 NSView* securitySectionView_; 34 NSView* securitySectionView_;
35 35
36 // Displays the web site identity. 36 // Displays the short security summary for the page
37 NSTextField* identityField_; 37 // (private/not private/etc.).
38 NSTextField* securitySummaryField_;
38 39
39 // Displays the security summary for the page (private/not private/etc.). 40 // Displays a longer explanation of the page's security state, and how the
40 NSTextField* securitySummaryField_; 41 // user should treat it.
42 NSTextField* securityDetailsField_;
41 43
42 // The link button for opening security details for the page. This is the 44 // The link button for opening security details for the page. This is the
43 // DevTools Security panel for most users, but may be the certificate viewer 45 // DevTools Security panel for most users, but may be the certificate viewer
44 // for enterprise users with DevTools disabled. 46 // for enterprise users with DevTools disabled.
45 NSButton* securityDetailsButton_; 47 NSButton* securityDetailsButton_;
46 48
47 // URL of the page for which the bubble is shown. 49 // URL of the page for which the bubble is shown.
48 GURL url_; 50 GURL url_;
49 51
52 // Displays a paragraph to accompany the reset decisions button, explaining
53 // that the user has made a decision to trust an invalid security certificate
54 // for the current site.
55 // This field only shows when there is an acrive certificate exception.
Avi (use Gerrit) 2016/08/24 04:02:41 active
lgarron 2016/08/26 23:27:04 Whoops, it seems I accidentally uploaded the lates
56 NSTextField* resetDecisionsField_;
57
58 // The link button for revoking certificate decisions.
59 // This link only shows when there is an acrive certificate exception.
Avi (use Gerrit) 2016/08/24 04:02:41 active
60 NSButton* resetDecisionsButton_;
61
50 // Whether DevTools is disabled for the relevant profile. 62 // Whether DevTools is disabled for the relevant profile.
51 BOOL isDevToolsDisabled_; 63 BOOL isDevToolsDisabled_;
52 64
53 // The ID of the server certificate from the identity info. This should 65 // The ID of the server certificate from the identity info. This should
54 // always be non-zero on a cryptographic connection, and 0 otherwise. 66 // always be non-zero on a cryptographic connection, and 0 otherwise.
55 int certificateId_; 67 int certificateId_;
56 68
57 // The link button for revoking certificate decisions.
58 NSButton* resetDecisionsButton_;
59
60 // Separator line. 69 // Separator line.
61 NSView* separatorAfterSecuritySection_; 70 NSView* separatorAfterSecuritySection_;
62 71
63 // Container for the site settings section. 72 // Container for the site settings section.
64 NSView* siteSettingsSectionView_; 73 NSView* siteSettingsSectionView_;
65 74
66 // Container for cookies info in the site settings section. 75 // Container for cookies info in the site settings section.
67 NSView* cookiesView_; 76 NSView* cookiesView_;
68 77
69 // Container for permission info in the site settings section. 78 // Container for permission info in the site settings section.
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 146
138 private: 147 private:
139 // The WebContents the bubble UI is attached to. 148 // The WebContents the bubble UI is attached to.
140 content::WebContents* web_contents_; 149 content::WebContents* web_contents_;
141 150
142 // The Cocoa controller for the bubble UI. 151 // The Cocoa controller for the bubble UI.
143 WebsiteSettingsBubbleController* bubble_controller_; 152 WebsiteSettingsBubbleController* bubble_controller_;
144 153
145 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsUIBridge); 154 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsUIBridge);
146 }; 155 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698