Remove the flags to RenderViewHost::EnablePreferredSizeMode since it's not...

Remove the flags to RenderViewHost::EnablePreferredSizeMode since it's not used after http://crbug.com/44850 was fixed.

BUG=98716
Review URL: http://codereview.chromium.org/8586032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110539 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_host.cc

@@ -37,7 +37,6 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/public/browser/notification_service.h"
-#include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "grit/browser_resources.h"
@@ -426,8 +425,7 @@ void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
 
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP ||
       extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR) {
-    render_view_host->EnablePreferredSizeMode(
-        kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow);
+    render_view_host->EnablePreferredSizeMode();
   }
 
   // If the host is bound to a browser, then extract its window id.

chrome/browser/notifications/balloon_host.cc

@@ -18,7 +18,6 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
@@ -78,8 +77,7 @@ void BalloonHost::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host->DisableScrollbarsForThreshold(
       balloon_->min_scrollbar_size());
   render_view_host->WasResized();
-  render_view_host->EnablePreferredSizeMode(
-      kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow);
+  render_view_host->EnablePreferredSizeMode();
 
   if (enable_web_ui_)
     render_view_host->AllowBindings(content::BINDINGS_POLICY_WEB_UI);

chrome/browser/tab_contents/tab_contents_view_mac.mm

@@ -189,7 +189,7 @@ void TabContentsViewMac::RenderViewCreated(RenderViewHost* host) {
   // We want updates whenever the intrinsic width of the webpage changes.
   // Put the RenderView into that mode. The preferred width is used for example
   // when the "zoom" button in the browser window is clicked.
-  host->EnablePreferredSizeMode(kPreferredSizeWidth);
+  host->EnablePreferredSizeMode();
 }
 
 void TabContentsViewMac::SetPageTitle(const string16& title) {

chrome/browser/ui/panels/panel.cc

@@ -18,7 +18,6 @@
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
@@ -578,8 +577,7 @@ RenderViewHost* Panel::GetRenderViewHost() const {
 
 void Panel::EnableAutoResize(RenderViewHost* render_view_host) {
   DCHECK(render_view_host);
-  render_view_host->EnablePreferredSizeMode(
-      kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow);
+  render_view_host->EnablePreferredSizeMode();
   RequestRenderViewHostToDisableScrollbars(render_view_host);
 }
 

content/browser/renderer_host/render_view_host.cc

@@ -1333,8 +1333,8 @@ void RenderViewHost::DisableScrollbarsForThreshold(const gfx::Size& size) {
   Send(new ViewMsg_DisableScrollbarsForSmallWindows(routing_id(), size));
 }
 
-void RenderViewHost::EnablePreferredSizeMode(int flags) {
-  Send(new ViewMsg_EnablePreferredSizeChangedMode(routing_id(), flags));
+void RenderViewHost::EnablePreferredSizeMode() {
+  Send(new ViewMsg_EnablePreferredSizeChangedMode(routing_id()));
 }
 
 void RenderViewHost::ExecuteCustomContextMenuCommand(

content/browser/renderer_host/render_view_host.h

@@ -439,7 +439,7 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost {
   void DisableScrollbarsForThreshold(const gfx::Size& size);
 
   // Instructs the RenderView to send back updates to the preferred size.
-  void EnablePreferredSizeMode(int flags);
+  void EnablePreferredSizeMode();
 
   // Executes custom context menu action that was provided from WebKit.
   void ExecuteCustomContextMenuCommand(

content/common/view_message_enums.h

@@ -69,15 +69,6 @@ struct ViewHostMsg_AccEvent {
   };
 };
 
-// Values that may be OR'd together to form the 'flags' parameter of the
-// ViewMsg_EnablePreferredSizeChangedMode message.
-enum ViewHostMsg_EnablePreferredSizeChangedMode_Flags {
-  kPreferredSizeNothing,
-  kPreferredSizeWidth = 1 << 0,
-  // Requesting the height currently requires a polling loop in render_view.cc.
-  kPreferredSizeHeightThisIsSlow = 1 << 1,
-};
-
 struct ViewHostMsg_RunFileChooser_Mode {
  public:
   enum Value {

content/common/view_messages.h

@@ -1056,8 +1056,7 @@ IPC_MESSAGE_ROUTED0(ViewMsg_MoveOrResizeStarted)
 IPC_MESSAGE_ROUTED0(ViewMsg_Move_ACK)
 
 // Used to instruct the RenderView to send back updates to the preferred size.
-IPC_MESSAGE_ROUTED1(ViewMsg_EnablePreferredSizeChangedMode,
-                    int /*flags*/)
+IPC_MESSAGE_ROUTED0(ViewMsg_EnablePreferredSizeChangedMode)
 
 // Changes the text direction of the currently selected input field (if any).
 IPC_MESSAGE_ROUTED1(ViewMsg_SetTextDirection,

content/renderer/render_view_impl.cc

@@ -3818,8 +3818,7 @@ void RenderViewImpl::OnFileChooserResponse(const std::vector<FilePath>& paths) {
   }
 }
 
-void RenderViewImpl::OnEnablePreferredSizeChangedMode(int flags) {
-  DCHECK(flags != kPreferredSizeNothing);
+void RenderViewImpl::OnEnablePreferredSizeChangedMode() {
   if (send_preferred_size_changes_)
     return;
   send_preferred_size_changes_ = true;

content/renderer/render_view_impl.h

@@ -776,7 +776,7 @@ class RenderViewImpl : public RenderWidget,
   void OnDragTargetDragOver(const gfx::Point& client_pt,
                             const gfx::Point& screen_pt,
                             WebKit::WebDragOperationsMask operations_allowed);
-  void OnEnablePreferredSizeChangedMode(int flags);
+  void OnEnablePreferredSizeChangedMode();
   void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths);
   void OnExecuteEditCommand(const std::string& name, const std::string& value);
   void OnFileChooserResponse(const std::vector<FilePath>& paths);