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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 172063002: Unify frame IDs with RenderFrameHost routing IDs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clean up Created 6 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // destination URL to request in the new process. 311 // destination URL to request in the new process.
312 std::vector<GURL> transfer_url_chain; 312 std::vector<GURL> transfer_url_chain;
313 313
314 // This is the referrer to use for the request in the new process. 314 // This is the referrer to use for the request in the new process.
315 Referrer referrer; 315 Referrer referrer;
316 316
317 // This is the transition type for the original navigation. 317 // This is the transition type for the original navigation.
318 PageTransition page_transition; 318 PageTransition page_transition;
319 319
320 // This is the frame ID to use in RequestTransferURL. 320 // This is the frame ID to use in RequestTransferURL.
321 // TODO(creis): Use frame routing IDs instead. Currently equivalent.
awong 2014/02/20 00:25:30 Do you mean to rename it basically? The TODO comm
Charlie Reis 2014/02/20 00:43:53 Yeah, there's no need for this TODO. There's stil
321 int64 frame_id; 322 int64 frame_id;
322 323
323 // This is whether the navigation should replace the current history entry. 324 // This is whether the navigation should replace the current history entry.
324 bool should_replace_current_entry; 325 bool should_replace_current_entry;
325 }; 326 };
326 327
327 // Used with FrameTree::ForEach to erase inactive RenderFrameHosts from a 328 // Used with FrameTree::ForEach to erase inactive RenderFrameHosts from a
328 // FrameTreeNode's RenderFrameHostManager. 329 // FrameTreeNode's RenderFrameHostManager.
329 static bool ClearSwappedOutRFHsInSiteInstance(int32 site_instance_id, 330 static bool ClearSwappedOutRFHsInSiteInstance(int32 site_instance_id,
330 FrameTreeNode* node); 331 FrameTreeNode* node);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 CrossProcessFrameConnector* cross_process_frame_connector_; 465 CrossProcessFrameConnector* cross_process_frame_connector_;
465 466
466 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 467 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
467 468
468 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 469 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
469 }; 470 };
470 471
471 } // namespace content 472 } // namespace content
472 473
473 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 474 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698