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

Side by Side Diff: content/browser/tab_contents/tab_contents.h

Issue 8372036: Ensure forced process swaps use the correct page_id and SiteInstance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add a test Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 // entry already be set). 584 // entry already be set).
585 // 585 //
586 // This is used as the backend for state updates, which include a new title, 586 // This is used as the backend for state updates, which include a new title,
587 // or the dedicated set title message. It returns true if the new title is 587 // or the dedicated set title message. It returns true if the new title is
588 // different and was therefore updated. 588 // different and was therefore updated.
589 bool UpdateTitleForEntry(NavigationEntry* entry, const string16& title); 589 bool UpdateTitleForEntry(NavigationEntry* entry, const string16& title);
590 590
591 // Causes the TabContents to navigate in the right renderer to |entry|, which 591 // Causes the TabContents to navigate in the right renderer to |entry|, which
592 // must be already part of the entries in the navigation controller. 592 // must be already part of the entries in the navigation controller.
593 // This does not change the NavigationController state. 593 // This does not change the NavigationController state.
594 bool NavigateToEntry(const NavigationEntry& entry, 594 bool NavigateToEntry(NavigationEntry* entry,
595 NavigationController::ReloadType reload_type); 595 NavigationController::ReloadType reload_type);
596 596
597 // Sets the history for this tab_contents to |history_length| entries, and 597 // Sets the history for this tab_contents to |history_length| entries, and
598 // moves the current page_id to the last entry in the list if it's valid. 598 // moves the current page_id to the last entry in the list if it's valid.
599 // This is mainly used when a prerendered page is swapped into the current 599 // This is mainly used when a prerendered page is swapped into the current
600 // tab. The method is virtual for testing. 600 // tab. The method is virtual for testing.
601 virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance, 601 virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
602 int merge_history_length, 602 int merge_history_length,
603 int32 minimum_page_id); 603 int32 minimum_page_id);
604 604
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 ObserverList<TabContentsObserver> observers_; 849 ObserverList<TabContentsObserver> observers_;
850 850
851 // Content restrictions, used to disable print/copy etc based on content's 851 // Content restrictions, used to disable print/copy etc based on content's
852 // (full-page plugins for now only) permissions. 852 // (full-page plugins for now only) permissions.
853 int content_restrictions_; 853 int content_restrictions_;
854 854
855 DISALLOW_COPY_AND_ASSIGN(TabContents); 855 DISALLOW_COPY_AND_ASSIGN(TabContents);
856 }; 856 };
857 857
858 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 858 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW
« no previous file with comments | « content/browser/tab_contents/render_view_host_manager.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698