Mac: Select right tab in content settings dialog.

chrome/browser/cocoa/content_settings_dialog_controller.h

Index: chrome/browser/cocoa/content_settings_dialog_controller.h
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.h b/chrome/browser/cocoa/content_settings_dialog_controller.h
index 7a4bc8c4dd4bf25151a0ff4fa475efd178e5450a..40dcecaf7508f2f70617c75341ead955ba8ca994 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.h
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.h
@@ -5,19 +5,23 @@
 #import <Cocoa/Cocoa.h>
 
 #import "base/cocoa_protocols_mac.h"
+#include "base/scoped_ptr.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/browser/pref_member.h"
 
+class PrefObserverBridge;
 class Profile;
 
 // This controller manages a dialog that lets the user manage the content
 // settings for several content setting types.
 @interface ContentSettingsDialogController
-    : NSWindowController<NSWindowDelegate> {
+    : NSWindowController<NSWindowDelegate, NSTabViewDelegate> {
  @private
+  IBOutlet NSTabView* tabView_;
   Profile* profile_;  // weak
   IntegerPrefMember lastSelectedTab_;
   BooleanPrefMember clearSiteDataOnExit_;
+  scoped_ptr<PrefObserverBridge> observer_;  // Watches for pref changes.
 }
 
 // Show the content settings dialog associated with the given profile (or the