Auto select the connection tab of the Website Settings UI in case of an https error or mixed content

chrome/browser/ui/cocoa/website_settings_bubble_controller.mm

Index: chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
index 55935120f72da159a95e8187be2f04546fa9cc6d..0e579df979e370c9d04d0a17c5a0dd78a515c4e2 100644
--- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
@@ -345,7 +345,7 @@ NSColor* IdentityVerifiedTextColor() {
       [[NSSegmentedControl alloc] initWithFrame:initialFrame]);
   [segmentedControl_ setCell:
       [[[WebsiteSettingsTabSegmentedCell alloc] init] autorelease]];
-  [segmentedControl_ setSegmentCount:2];
+  [segmentedControl_ setSegmentCount:NUM_TAB_IDS];
   [segmentedControl_ setTarget:self];
   [segmentedControl_ setAction:@selector(tabSelected:)];
 
@@ -360,21 +360,23 @@ NSColor* IdentityVerifiedTextColor() {
       IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS);
   NSSize textSize = [label sizeWithAttributes:textAttributes];
   CGFloat tabWidth = textSize.width + 2 * kTabLabelXPadding;

[msw, 2012/08/23 22:59:41]

nit: the width determination code sux, but leave it alone for now, I guess.
It should be: set 1st label; set 2nd label; determine widest; apply widths.

[markusheintz_, 2012/08/24 12:42:43]

@Patrick: Is this something you want to fix in a followup CL or should I do it? 

[Patrick Dubroy, 2012/08/24 12:48:15]

I don't understand what you mean. Isn't that what the code already does? Are you
suggesting a functional change, or just shuffling the lines around to read a bit
differently?

[msw, 2012/08/24 18:56:40]

Ah, don't worry about it, I'd just remove the first unnecessary setWidth, do
maxWidth = max(sizeWithAttributes(...),...) before padding, then add padding and
call setWidth, seems just slightly cleaner.

-  [segmentedControl_ setLabel:label forSegment:0];
-  [segmentedControl_ setWidth:tabWidth + kTabStripXPadding forSegment:0];
+  [segmentedControl_ setLabel:label forSegment:TAB_ID_PERMISSIONS];
+  [segmentedControl_ setWidth:tabWidth + kTabStripXPadding
+                   forSegment:TAB_ID_PERMISSIONS];
 
   // Create the "Connection" tab.
   label = l10n_util::GetNSString(IDS_WEBSITE_SETTINGS_TAB_LABEL_CONNECTION);
   textSize = [label sizeWithAttributes:textAttributes];
-  [segmentedControl_ setLabel:label forSegment:1];
+  [segmentedControl_ setLabel:label forSegment:TAB_ID_CONNECTION];
 
   // Make both tabs the width of the widest. The first segment has some
   // additional padding that is not part of the tab, which is used for drawing
   // the background of the tab strip.
   tabWidth = std::max(tabWidth,
                       textSize.width + 2 * kTabLabelXPadding);
-  [segmentedControl_ setWidth:tabWidth + kTabStripXPadding forSegment:0];
-  [segmentedControl_ setWidth:tabWidth forSegment:1];
+  [segmentedControl_ setWidth:tabWidth + kTabStripXPadding
+                   forSegment:TAB_ID_PERMISSIONS];
+  [segmentedControl_ setWidth:tabWidth forSegment:TAB_ID_CONNECTION];
 
   [segmentedControl_ setFont:smallSystemFont];
   [segmentedControl_ setSelectedSegment:0];
@@ -1041,3 +1043,7 @@ void WebsiteSettingsUIBridge::SetPermissionInfo(
 void WebsiteSettingsUIBridge::SetFirstVisit(const string16& first_visit) {
   [bubble_controller_ setFirstVisit:first_visit];
 }
+
+void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
+  // TODO(dubroy): Implement this method.
+}