Index: content/browser/frame_host/navigation_controller_impl.h |
diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h |
index f43106233e1c12cf3f2718e057be678849446122..1f399591f76e57ccc71e0081f521a7ef40106935 100644 |
--- a/content/browser/frame_host/navigation_controller_impl.h |
+++ b/content/browser/frame_host/navigation_controller_impl.h |
@@ -35,21 +35,20 @@ class CONTENT_EXPORT NavigationControllerImpl |
: public NON_EXPORTED_BASE(NavigationController) { |
public: |
NavigationControllerImpl( |
NavigationControllerDelegate* delegate, |
BrowserContext* browser_context); |
~NavigationControllerImpl() override; |
// NavigationController implementation: |
WebContents* GetWebContents() const override; |
BrowserContext* GetBrowserContext() const override; |
- void SetBrowserContext(BrowserContext* browser_context) override; |
void Restore(int selected_navigation, |
RestoreType type, |
std::vector<std::unique_ptr<NavigationEntry>>* entries) override; |
NavigationEntryImpl* GetActiveEntry() const override; |
NavigationEntryImpl* GetVisibleEntry() const override; |
int GetCurrentEntryIndex() const override; |
NavigationEntryImpl* GetLastCommittedEntry() const override; |
int GetLastCommittedEntryIndex() const override; |
bool CanViewSource() const override; |
int GetEntryCount() const override; |
@@ -355,21 +354,21 @@ class CONTENT_EXPORT NavigationControllerImpl |
// transient_entry_index_). |
void InsertEntriesFrom(const NavigationControllerImpl& source, int max_index); |
// Returns the navigation index that differs from the current entry by the |
// specified |offset|. The index returned is not guaranteed to be valid. |
int GetIndexForOffset(int offset) const; |
// --------------------------------------------------------------------------- |
// The user browser context associated with this controller. |
- BrowserContext* browser_context_; |
+ BrowserContext* const browser_context_; |
nasko
2016/06/06 21:46:52
Let's keep this CL to only removing the API. If yo
|
// List of |NavigationEntry|s for this controller. |
std::vector<std::unique_ptr<NavigationEntryImpl>> entries_; |
// An entry we haven't gotten a response for yet. This will be discarded |
// when we navigate again. It's used only so we know what the currently |
// displayed tab is. |
// |
// This may refer to an item in the entries_ list if the pending_entry_index_ |
// == -1, or it may be its own entry that should be deleted. Be careful with |