Move RenderViewHostDelegateViewHelper to content.

content/browser/tab_contents/tab_contents_view_helper.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.
 
-#ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_DELEGATE_HELPER_H_
-#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_DELEGATE_HELPER_H_
+#ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_HELPER_H_
+#define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_HELPER_H_
 #pragma once
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class RenderWidgetHostView;
 class TabContents;
 struct ViewHostMsg_CreateWindow_Params;
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
 class Rect;
 }
 
 // TODO(avi): Once all the TabContentsViews implementations are in content (I'm
 // looking at you, TabContentsViewViews...) then change the parameters to take
 // WebContentsImpl rather than WebContents.
 
 // Provides helper methods that provide common implementations of some
 // TabContentsView methods.
-class RenderViewHostDelegateViewHelper : public content::NotificationObserver {
+class TabContentsViewHelper : public content::NotificationObserver {
  public:
-  RenderViewHostDelegateViewHelper();
-  virtual ~RenderViewHostDelegateViewHelper();
+  TabContentsViewHelper();
+  virtual ~TabContentsViewHelper();
 
   // Creates a new window; call |ShowCreatedWindow| below to show it.
   TabContents* CreateNewWindow(content::WebContents* web_contents,
                                int route_id,
                                const ViewHostMsg_CreateWindow_Params& params);
 
   // Creates a new popup or fullscreen widget; call |ShowCreatedWidget| below to
   // show it. If |is_fullscreen| is true it is a fullscreen widget, if not then
   // a pop-up. |popup_type| is only meaningful for a pop-up.
   RenderWidgetHostView* CreateNewWidget(content::WebContents* web_contents,
@@ skipping 23 matching lines @@
 
   // Finds the new RenderWidgetHost and returns it. Note that this can only be
   // called once as this call also removes it from the internal map.
   RenderWidgetHostView* GetCreatedWidget(int route_id);
 
   // Finds the new TabContents by route_id, initializes it for
   // renderer-initiated creation, and returns it. Note that this can only be
   // called once as this call also removes it from the internal map.
   TabContents* GetCreatedWindow(int route_id);
 
   // Tracks created RenderViewHost objects that have not been shown yet.

[jochen (gone - plz use gerrit), 2012/01/10 23:26:00]

nit. TabContents

[Avi (use Gerrit), 2012/01/11 03:17:11]

Yes, thank you. I switched it back but missed this comment.

   // They are identified by the route ID passed to CreateNewWindow.
   typedef std::map<int, TabContents*> PendingContents;
   PendingContents pending_contents_;
 
   // These maps hold on to the widgets that we created on behalf of the
   // renderer that haven't shown yet.
   typedef std::map<int, RenderWidgetHostView*> PendingWidgetViews;
   PendingWidgetViews pending_widget_views_;
 
   // Registers and unregisters us for notifications.
   content::NotificationRegistrar registrar_;
 
-  DISALLOW_COPY_AND_ASSIGN(RenderViewHostDelegateViewHelper);
+  DISALLOW_COPY_AND_ASSIGN(TabContentsViewHelper);
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_DELEGATE_HELPER_H_
+#endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_HELPER_H_