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

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

Issue 7491096: Fix regression with back-button not working on prerendered and instant pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add a swap Created 9 years, 4 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) 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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 // or the dedicated set title message. It returns true if the new title is 616 // or the dedicated set title message. It returns true if the new title is
617 // different and was therefore updated. 617 // different and was therefore updated.
618 bool UpdateTitleForEntry(NavigationEntry* entry, const string16& title); 618 bool UpdateTitleForEntry(NavigationEntry* entry, const string16& title);
619 619
620 // Causes the TabContents to navigate in the right renderer to |entry|, which 620 // Causes the TabContents to navigate in the right renderer to |entry|, which
621 // must be already part of the entries in the navigation controller. 621 // must be already part of the entries in the navigation controller.
622 // This does not change the NavigationController state. 622 // This does not change the NavigationController state.
623 bool NavigateToEntry(const NavigationEntry& entry, 623 bool NavigateToEntry(const NavigationEntry& entry,
624 NavigationController::ReloadType reload_type); 624 NavigationController::ReloadType reload_type);
625 625
626 // Shifts the history for this tab_contents over by |history_length| entries.
627 // This is mainly used when a prerendered page is swapped into the current
628 // tab.
629 void ShiftHistory(int history_length);
630
631
626 // Misc non-view stuff ------------------------------------------------------- 632 // Misc non-view stuff -------------------------------------------------------
627 633
628 // Helper functions for sending notifications. 634 // Helper functions for sending notifications.
629 void NotifySwapped(); 635 void NotifySwapped();
630 void NotifyConnected(); 636 void NotifyConnected();
631 void NotifyDisconnected(); 637 void NotifyDisconnected();
632 638
633 // RenderViewHostDelegate ---------------------------------------------------- 639 // RenderViewHostDelegate ----------------------------------------------------
634 640
635 // RenderViewHostDelegate implementation. 641 // RenderViewHostDelegate implementation.
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 ObserverList<TabContentsObserver> observers_; 864 ObserverList<TabContentsObserver> observers_;
859 865
860 // Content restrictions, used to disable print/copy etc based on content's 866 // Content restrictions, used to disable print/copy etc based on content's
861 // (full-page plugins for now only) permissions. 867 // (full-page plugins for now only) permissions.
862 int content_restrictions_; 868 int content_restrictions_;
863 869
864 DISALLOW_COPY_AND_ASSIGN(TabContents); 870 DISALLOW_COPY_AND_ASSIGN(TabContents);
865 }; 871 };
866 872
867 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 873 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698