| Index: chrome/browser/sessions/restore_tab_helper.cc
|
| ===================================================================
|
| --- chrome/browser/sessions/restore_tab_helper.cc (revision 116331)
|
| +++ chrome/browser/sessions/restore_tab_helper.cc (working copy)
|
| @@ -7,13 +7,14 @@
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| #include "chrome/common/extensions/extension_messages.h"
|
| #include "content/browser/renderer_host/render_view_host.h"
|
| -#include "content/browser/tab_contents/tab_contents.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_types.h"
|
| +#include "content/public/browser/web_contents.h"
|
|
|
| -RestoreTabHelper::RestoreTabHelper(TabContents* contents)
|
| - : content::WebContentsObserver(contents),
|
| - contents_(contents) {
|
| +using content::WebContents;
|
| +
|
| +RestoreTabHelper::RestoreTabHelper(WebContents* contents)
|
| + : content::WebContentsObserver(contents) {
|
| }
|
|
|
| RestoreTabHelper::~RestoreTabHelper() {
|
| @@ -24,7 +25,7 @@
|
|
|
| // TODO(mpcomplete): Maybe this notification should send out a TabContents.
|
| TabContentsWrapper* tab =
|
| - TabContentsWrapper::GetCurrentWrapperForContents(contents_);
|
| + TabContentsWrapper::GetCurrentWrapperForContents(web_contents());
|
| if (tab) {
|
| content::NotificationService::current()->Notify(
|
| content::NOTIFICATION_TAB_PARENTED,
|
| @@ -34,9 +35,9 @@
|
|
|
| // Extension code in the renderer holds the ID of the window that hosts it.
|
| // Notify it that the window ID changed.
|
| - contents_->GetRenderViewHost()->Send(
|
| + web_contents()->GetRenderViewHost()->Send(
|
| new ExtensionMsg_UpdateBrowserWindowId(
|
| - contents_->GetRenderViewHost()->routing_id(), id.id()));
|
| + web_contents()->GetRenderViewHost()->routing_id(), id.id()));
|
| }
|
|
|
| void RestoreTabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
|
|
|