| Index: content/browser/web_contents/web_contents_view_win.h
|
| diff --git a/content/browser/tab_contents/tab_contents_view_win.h b/content/browser/web_contents/web_contents_view_win.h
|
| similarity index 90%
|
| rename from content/browser/tab_contents/tab_contents_view_win.h
|
| rename to content/browser/web_contents/web_contents_view_win.h
|
| index 28ffee5405ebc74ec5d66781c4394f74bf68767f..e5b9cba9611131778864638ca0babb1939b59381 100644
|
| --- a/content/browser/tab_contents/tab_contents_view_win.h
|
| +++ b/content/browser/web_contents/web_contents_view_win.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
|
| -#define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
|
| +#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
|
| +#define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
|
| #pragma once
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/timer.h"
|
| #include "base/win/win_util.h"
|
| -#include "content/browser/tab_contents/tab_contents_view_helper.h"
|
| +#include "content/browser/web_contents/web_contents_view_helper.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/web_contents_view.h"
|
| #include "ui/base/win/window_impl.h"
|
| @@ -24,14 +24,14 @@ class WebContentsViewDelegate;
|
| }
|
|
|
| // An implementation of WebContentsView for Windows.
|
| -class CONTENT_EXPORT TabContentsViewWin : public content::WebContentsView,
|
| +class CONTENT_EXPORT WebContentsViewWin : public content::WebContentsView,
|
| public ui::WindowImpl {
|
| public:
|
| - TabContentsViewWin(WebContentsImpl* web_contents,
|
| + WebContentsViewWin(WebContentsImpl* web_contents,
|
| content::WebContentsViewDelegate* delegate);
|
| - virtual ~TabContentsViewWin();
|
| + virtual ~WebContentsViewWin();
|
|
|
| - BEGIN_MSG_MAP_EX(TabContentsViewWin)
|
| + BEGIN_MSG_MAP_EX(WebContentsViewWin)
|
| MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
|
| MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged)
|
| MESSAGE_HANDLER(WM_LBUTTONDOWN, OnMouseDown)
|
| @@ -143,12 +143,12 @@ class CONTENT_EXPORT TabContentsViewWin : public content::WebContentsView,
|
| bool close_tab_after_drag_ends_;
|
|
|
| // Used to close the tab after the stack has unwound.
|
| - base::OneShotTimer<TabContentsViewWin> close_tab_timer_;
|
| + base::OneShotTimer<WebContentsViewWin> close_tab_timer_;
|
|
|
| // Common implementations of some WebContentsView methods.
|
| - TabContentsViewHelper tab_contents_view_helper_;
|
| + WebContentsViewHelper web_contents_view_helper_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(TabContentsViewWin);
|
| + DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin);
|
| };
|
|
|
| -#endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
|
| +#endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
|
|
|