Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(714)

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 616163002: Revert of Ensure that the browser’s copy of page id is in sync with the renderer’s. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 // interface is going away. 405 // interface is going away.
406 // virtual WebContents* GetAsWebContents() OVERRIDE; 406 // virtual WebContents* GetAsWebContents() OVERRIDE;
407 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 407 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
408 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; 408 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
409 virtual void RenderViewReady(RenderViewHost* render_view_host) OVERRIDE; 409 virtual void RenderViewReady(RenderViewHost* render_view_host) OVERRIDE;
410 virtual void RenderViewTerminated(RenderViewHost* render_view_host, 410 virtual void RenderViewTerminated(RenderViewHost* render_view_host,
411 base::TerminationStatus status, 411 base::TerminationStatus status,
412 int error_code) OVERRIDE; 412 int error_code) OVERRIDE;
413 virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE; 413 virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE;
414 virtual void UpdateState(RenderViewHost* render_view_host, 414 virtual void UpdateState(RenderViewHost* render_view_host,
415 int32 rvh_page_id,
416 int32 page_id, 415 int32 page_id,
417 const PageState& page_state) OVERRIDE; 416 const PageState& page_state) OVERRIDE;
418 virtual void UpdateTargetURL(const GURL& url) OVERRIDE; 417 virtual void UpdateTargetURL(const GURL& url) OVERRIDE;
419 virtual void Close(RenderViewHost* render_view_host) OVERRIDE; 418 virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
420 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE; 419 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE;
421 virtual void DidCancelLoading() OVERRIDE; 420 virtual void DidCancelLoading() OVERRIDE;
422 virtual void DocumentAvailableInMainFrame( 421 virtual void DocumentAvailableInMainFrame(
423 RenderViewHost* render_view_host) OVERRIDE; 422 RenderViewHost* render_view_host) OVERRIDE;
424 virtual void RouteCloseEvent(RenderViewHost* rvh) OVERRIDE; 423 virtual void RouteCloseEvent(RenderViewHost* rvh) OVERRIDE;
425 virtual void RouteMessageEvent( 424 virtual void RouteMessageEvent(
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 scoped_ptr<WebContentsAudioMuter> audio_muter_; 1245 scoped_ptr<WebContentsAudioMuter> audio_muter_;
1247 1246
1248 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; 1247 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1249 1248
1250 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1249 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1251 }; 1250 };
1252 1251
1253 } // namespace content 1252 } // namespace content
1254 1253
1255 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1254 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698