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

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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 override; 530 override;
531 531
532 // RenderFrameHostManager::Delegate ------------------------------------------ 532 // RenderFrameHostManager::Delegate ------------------------------------------
533 533
534 bool CreateRenderViewForRenderManager( 534 bool CreateRenderViewForRenderManager(
535 RenderViewHost* render_view_host, 535 RenderViewHost* render_view_host,
536 int opener_route_id, 536 int opener_route_id,
537 int proxy_routing_id, 537 int proxy_routing_id,
538 bool for_main_frame_navigation) override; 538 bool for_main_frame_navigation) override;
539 bool CreateRenderFrameForRenderManager(RenderFrameHost* render_frame_host, 539 bool CreateRenderFrameForRenderManager(RenderFrameHost* render_frame_host,
540 int parent_routing_id) override; 540 int parent_routing_id,
541 int proxy_routing_id) override;
541 void BeforeUnloadFiredFromRenderManager( 542 void BeforeUnloadFiredFromRenderManager(
542 bool proceed, 543 bool proceed,
543 const base::TimeTicks& proceed_time, 544 const base::TimeTicks& proceed_time,
544 bool* proceed_to_fire_unload) override; 545 bool* proceed_to_fire_unload) override;
545 void RenderProcessGoneFromRenderManager( 546 void RenderProcessGoneFromRenderManager(
546 RenderViewHost* render_view_host) override; 547 RenderViewHost* render_view_host) override;
547 void UpdateRenderViewSizeForRenderManager() override; 548 void UpdateRenderViewSizeForRenderManager() override;
548 void CancelModalDialogsForRenderManager() override; 549 void CancelModalDialogsForRenderManager() override;
549 void NotifySwappedFromRenderManager(RenderFrameHost* old_host, 550 void NotifySwappedFromRenderManager(RenderFrameHost* old_host,
550 RenderFrameHost* new_host, 551 RenderFrameHost* new_host,
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 scoped_ptr<WebContentsAudioMuter> audio_muter_; 1219 scoped_ptr<WebContentsAudioMuter> audio_muter_;
1219 1220
1220 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; 1221 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1221 1222
1222 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1223 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1223 }; 1224 };
1224 1225
1225 } // namespace content 1226 } // namespace content
1226 1227
1227 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1228 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/site_per_process_browsertest.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