Add Geolocation to the content types. This adds several special case guards s...

chrome/browser/cocoa/content_blocked_bubble_controller.mm

 // Copyright (c) 2010 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/cocoa/content_blocked_bubble_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/string_util.h"
@@ skipping 76 matching lines @@
   // This method takes ownership of |contentSettingBubbleModel| in all cases.
   scoped_ptr<ContentSettingBubbleModel> model(contentSettingBubbleModel);
   DCHECK(model.get());
 
   NSString* const nibPaths[CONTENT_SETTINGS_NUM_TYPES] = {
     @"ContentBlockedCookies",
     @"ContentBlockedImages",
     @"ContentBlockedJavaScript",
     @"ContentBlockedPlugins",
     @"ContentBlockedPopups",
+    // TODO(joth/thakis): Implement Geolocation. In the meantime, use
+    // another xib here to keep the unit test happy.
+    @"ContentBlockedCookies",
   };
   COMPILE_ASSERT(arraysize(nibPaths) == CONTENT_SETTINGS_NUM_TYPES,
                  nibPaths_requires_an_entry_for_every_setting_type);
   const int settingsType = model->content_type();
   DCHECK_LT(settingsType, CONTENT_SETTINGS_NUM_TYPES);
   NSString* nibPath =
       [mac_util::MainAppBundle() pathForResource:nibPaths[settingsType]
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     parentWindow_ = parentWindow;
@@ skipping 236 matching lines @@
   contentSettingBubbleModel_->OnManageLinkClicked();
 }
 
 - (void)popupLinkClicked:(id)sender {
   content_blocked_bubble::PopupLinks::iterator i(popupLinks_.find(sender));
   DCHECK(i != popupLinks_.end());
   contentSettingBubbleModel_->OnPopupClicked(i->second);
 }
 
 @end  // ContentBlockedBubbleController