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..348444163026ed0a346c2df9ef8c4edfaf6f9094 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,25 @@ NSColor* IdentityVerifiedTextColor() {
       IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS);
   NSSize textSize = [label sizeWithAttributes:textAttributes];
   CGFloat tabWidth = textSize.width + 2 * kTabLabelXPadding;
-  [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];
+
+  DCHECK_EQ( [segmentedControl_ segmentCount ], NUM_TAB_IDS);

[msw, 2012/08/24 18:59:14]

nit: no space after open paren.

[msw, 2012/08/24 19:00:01]

Doh, also no space before close square bracket

[markusheintz_, 2012/08/27 09:09:30]

Done.

[markusheintz_, 2012/08/27 09:09:30]

Done.

 
   // 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 +1045,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.
+}