Merge 169678

chrome/browser/ui/cocoa/website_settings_bubble_controller.h

 // 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 <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
@@ skipping 66 matching lines @@
 }
 
 // Designated initializer. The controller will release itself when the bubble
 // is closed. |parentWindow| cannot be nil. |tabContents| may be nil for
 // testing purposes.
 - (id)initWithParentWindow:(NSWindow*)parentWindow
    websiteSettingsUIBridge:(WebsiteSettingsUIBridge*)bridge
                tabContents:(TabContents*)tabContents
             isInternalPage:(BOOL)isInternalPage;
 
-- (void)permissionValueChanged:(id)sender;
+// Return the default width of the window. It may be wider to fit the content.
+// This may be overriden by a subclass for testing purposes.
+- (CGFloat)defaultWindowWidth;
 
 @end
 
 // Provides a bridge between the WebSettingsUI C++ interface and the Cocoa
 // implementation in WebsiteSettingsBubbleController.
 class WebsiteSettingsUIBridge : public WebsiteSettingsUI {
  public:
   WebsiteSettingsUIBridge();
   virtual ~WebsiteSettingsUIBridge();
 
@@ skipping 18 matching lines @@
   virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE;
   virtual void SetFirstVisit(const string16& first_visit) OVERRIDE;
   virtual void SetSelectedTab(TabId tab_id) OVERRIDE;
 
  private:
   // The Cocoa controller for the bubble UI.
   WebsiteSettingsBubbleController* bubble_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsUIBridge);
 };