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

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

Issue 600553003: Enable swapping a frame back in to its parent process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remoteToLocal
Patch Set: Created 6 years, 1 month 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 override; 526 override;
527 527
528 // RenderFrameHostManager::Delegate ------------------------------------------ 528 // RenderFrameHostManager::Delegate ------------------------------------------
529 529
530 bool CreateRenderViewForRenderManager( 530 bool CreateRenderViewForRenderManager(
531 RenderViewHost* render_view_host, 531 RenderViewHost* render_view_host,
532 int opener_route_id, 532 int opener_route_id,
533 int proxy_routing_id, 533 int proxy_routing_id,
534 bool for_main_frame_navigation) override; 534 bool for_main_frame_navigation) override;
535 bool CreateRenderFrameForRenderManager(RenderFrameHost* render_frame_host, 535 bool CreateRenderFrameForRenderManager(RenderFrameHost* render_frame_host,
536 int parent_routing_id) override; 536 int parent_routing_id,
537 int proxy_routing_id) override;
537 void BeforeUnloadFiredFromRenderManager( 538 void BeforeUnloadFiredFromRenderManager(
538 bool proceed, 539 bool proceed,
539 const base::TimeTicks& proceed_time, 540 const base::TimeTicks& proceed_time,
540 bool* proceed_to_fire_unload) override; 541 bool* proceed_to_fire_unload) override;
541 void RenderProcessGoneFromRenderManager( 542 void RenderProcessGoneFromRenderManager(
542 RenderViewHost* render_view_host) override; 543 RenderViewHost* render_view_host) override;
543 void UpdateRenderViewSizeForRenderManager() override; 544 void UpdateRenderViewSizeForRenderManager() override;
544 void CancelModalDialogsForRenderManager() override; 545 void CancelModalDialogsForRenderManager() override;
545 void NotifySwappedFromRenderManager(RenderFrameHost* old_host, 546 void NotifySwappedFromRenderManager(RenderFrameHost* old_host,
546 RenderFrameHost* new_host, 547 RenderFrameHost* new_host,
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 scoped_ptr<WebContentsAudioMuter> audio_muter_; 1215 scoped_ptr<WebContentsAudioMuter> audio_muter_;
1215 1216
1216 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; 1217 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1217 1218
1218 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1219 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1219 }; 1220 };
1220 1221
1221 } // namespace content 1222 } // namespace content
1222 1223
1223 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1224 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698