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

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

Issue 295833002: Revert 271461 "Decouple RVH creation from CrossProcessFrameConne..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 #if defined(OS_WIN) 512 #if defined(OS_WIN)
513 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; 513 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
514 #endif 514 #endif
515 515
516 // RenderFrameHostManager::Delegate ------------------------------------------ 516 // RenderFrameHostManager::Delegate ------------------------------------------
517 517
518 virtual bool CreateRenderViewForRenderManager( 518 virtual bool CreateRenderViewForRenderManager(
519 RenderViewHost* render_view_host, 519 RenderViewHost* render_view_host,
520 int opener_route_id, 520 int opener_route_id,
521 int proxy_routing_id, 521 int proxy_routing_id,
522 bool for_main_frame) OVERRIDE; 522 CrossProcessFrameConnector* frame_connector) OVERRIDE;
523 virtual void BeforeUnloadFiredFromRenderManager( 523 virtual void BeforeUnloadFiredFromRenderManager(
524 bool proceed, const base::TimeTicks& proceed_time, 524 bool proceed, const base::TimeTicks& proceed_time,
525 bool* proceed_to_fire_unload) OVERRIDE; 525 bool* proceed_to_fire_unload) OVERRIDE;
526 virtual void RenderProcessGoneFromRenderManager( 526 virtual void RenderProcessGoneFromRenderManager(
527 RenderViewHost* render_view_host) OVERRIDE; 527 RenderViewHost* render_view_host) OVERRIDE;
528 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE; 528 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE;
529 virtual void CancelModalDialogsForRenderManager() OVERRIDE; 529 virtual void CancelModalDialogsForRenderManager() OVERRIDE;
530 virtual void NotifySwappedFromRenderManager( 530 virtual void NotifySwappedFromRenderManager(
531 RenderViewHost* old_host, RenderViewHost* new_host) OVERRIDE; 531 RenderViewHost* old_host, RenderViewHost* new_host) OVERRIDE;
532 virtual int CreateOpenerRenderViewsForRenderManager( 532 virtual int CreateOpenerRenderViewsForRenderManager(
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 bool last_dialog_suppressed_; 1126 bool last_dialog_suppressed_;
1127 1127
1128 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_; 1128 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_;
1129 1129
1130 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1130 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1131 }; 1131 };
1132 1132
1133 } // namespace content 1133 } // namespace content
1134 1134
1135 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1135 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698