| Index: content/browser/tab_contents/tab_contents_view_helper.h
|
| diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/content/browser/tab_contents/tab_contents_view_helper.h
|
| similarity index 84%
|
| rename from chrome/browser/tab_contents/render_view_host_delegate_helper.h
|
| rename to content/browser/tab_contents/tab_contents_view_helper.h
|
| index 1d38de47e2b0643cfb00c7d8accd04743703de93..cf73b8b8067c5bac0852a515a13c1d1f75592733 100644
|
| --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h
|
| +++ b/content/browser/tab_contents/tab_contents_view_helper.h
|
| @@ -2,14 +2,15 @@
|
| // 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/common/content_export.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"
|
| @@ -33,10 +34,11 @@ class Rect;
|
|
|
| // Provides helper methods that provide common implementations of some
|
| // TabContentsView methods.
|
| -class RenderViewHostDelegateViewHelper : public content::NotificationObserver {
|
| +class CONTENT_EXPORT 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,
|
| @@ -80,20 +82,20 @@ class RenderViewHostDelegateViewHelper : public content::NotificationObserver {
|
| // 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.
|
| - // They are identified by the route ID passed to CreateNewWindow.
|
| + // Tracks created TabContents objects that have not been shown yet. 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.
|
| + // 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_
|
|
|