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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h"
 
 #include "base/string_number_conversions.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 327 matching lines @@
                                 toView:contentView_
                                atPoint:controlOrigin];
 
   // Create the tab view and its two tabs.
 
   NSRect initialFrame = NSMakeRect(0, 0, kWindowWidth, kTabStripHeight);
   segmentedControl_.reset(
       [[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:)];
 
   NSFont* smallSystemFont =
       [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
   NSDictionary* textAttributes =
       [NSDictionary dictionaryWithObject:smallSystemFont
                                   forKey:NSFontAttributeName];
 
   // Create the "Permissions" tab.
   NSString* label = l10n_util::GetNSString(
       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];
   [contentView_ addSubview:segmentedControl_];
 
   NSRect tabFrame = NSMakeRect(0, 0, kWindowWidth, 300);
   tabView_.reset([[NSTabView alloc] initWithFrame:tabFrame]);
   [tabView_ setTabViewType:NSNoTabsNoBorder];
   [tabView_ setDrawsBackground:NO];
   [tabView_ setControlSize:NSSmallControlSize];
@@ skipping 646 matching lines @@
 }
 
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetFirstVisit(const string16& first_visit) {
   [bubble_controller_ setFirstVisit:first_visit];
 }
+
+void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
+  // TODO(dubroy): Implement this method.
+}