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

Side by Side Diff: content/browser/web_contents/navigation_controller_impl.h

Issue 12637002: Set IsInitialNavigation to false after commit, not document load. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« no previous file with comments | « no previous file | content/browser/web_contents/navigation_controller_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_NAVIGATION_CONTROLLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 virtual void RemoveEntryAtIndex(int index) OVERRIDE; 72 virtual void RemoveEntryAtIndex(int index) OVERRIDE;
73 virtual const SessionStorageNamespaceMap& 73 virtual const SessionStorageNamespaceMap&
74 GetSessionStorageNamespaceMap() const OVERRIDE; 74 GetSessionStorageNamespaceMap() const OVERRIDE;
75 virtual SessionStorageNamespace* 75 virtual SessionStorageNamespace*
76 GetDefaultSessionStorageNamespace() OVERRIDE; 76 GetDefaultSessionStorageNamespace() OVERRIDE;
77 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE; 77 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;
78 virtual int32 GetMaxRestoredPageID() const OVERRIDE; 78 virtual int32 GetMaxRestoredPageID() const OVERRIDE;
79 virtual bool NeedsReload() const OVERRIDE; 79 virtual bool NeedsReload() const OVERRIDE;
80 virtual void CancelPendingReload() OVERRIDE; 80 virtual void CancelPendingReload() OVERRIDE;
81 virtual void ContinuePendingReload() OVERRIDE; 81 virtual void ContinuePendingReload() OVERRIDE;
82 virtual bool IsInitialNavigation() OVERRIDE; 82 virtual bool IsInitialNavigation() const OVERRIDE;
83 virtual void Reload(bool check_for_repost) OVERRIDE; 83 virtual void Reload(bool check_for_repost) OVERRIDE;
84 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE; 84 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;
85 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE; 85 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE;
86 virtual void NotifyEntryChanged(const NavigationEntry* entry, 86 virtual void NotifyEntryChanged(const NavigationEntry* entry,
87 int index) OVERRIDE; 87 int index) OVERRIDE;
88 virtual void CopyStateFrom( 88 virtual void CopyStateFrom(
89 const NavigationController& source) OVERRIDE; 89 const NavigationController& source) OVERRIDE;
90 virtual void CopyStateFromAndPrune( 90 virtual void CopyStateFromAndPrune(
91 NavigationController* source) OVERRIDE; 91 NavigationController* source) OVERRIDE;
92 virtual void PruneAllButActive() OVERRIDE; 92 virtual void PruneAllButActive() OVERRIDE;
(...skipping 18 matching lines...) Expand all
111 NavigationEntryImpl* GetEntryWithPageID( 111 NavigationEntryImpl* GetEntryWithPageID(
112 SiteInstance* instance, 112 SiteInstance* instance,
113 int32 page_id) const; 113 int32 page_id) const;
114 114
115 // WebContentsImpl ----------------------------------------------------------- 115 // WebContentsImpl -----------------------------------------------------------
116 116
117 WebContentsImpl* web_contents() const { 117 WebContentsImpl* web_contents() const {
118 return web_contents_; 118 return web_contents_;
119 } 119 }
120 120
121 // Called when a document has been loaded in a frame.
122 void DocumentLoadedInFrame();
123
124 // For use by WebContentsImpl ------------------------------------------------ 121 // For use by WebContentsImpl ------------------------------------------------
125 122
126 // Handles updating the navigation state after the renderer has navigated. 123 // Handles updating the navigation state after the renderer has navigated.
127 // This is used by the WebContentsImpl. 124 // This is used by the WebContentsImpl.
128 // 125 //
129 // If a new entry is created, it will return true and will have filled the 126 // If a new entry is created, it will return true and will have filled the
130 // given details structure and broadcast the NOTIFY_NAV_ENTRY_COMMITTED 127 // given details structure and broadcast the NOTIFY_NAV_ENTRY_COMMITTED
131 // notification. The caller can then use the details without worrying about 128 // notification. The caller can then use the details without worrying about
132 // listening for the notification. 129 // listening for the notification.
133 // 130 //
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 // of the restored entries to update its max page ID. 370 // of the restored entries to update its max page ID.
374 int32 max_restored_page_id_; 371 int32 max_restored_page_id_;
375 372
376 // Manages the SSL security UI 373 // Manages the SSL security UI
377 SSLManager ssl_manager_; 374 SSLManager ssl_manager_;
378 375
379 // Whether we need to be reloaded when made active. 376 // Whether we need to be reloaded when made active.
380 bool needs_reload_; 377 bool needs_reload_;
381 378
382 // Whether this is the initial navigation. 379 // Whether this is the initial navigation.
383 // Becomes false when initial navigation is loaded. 380 // Becomes false when initial navigation commits.
384 bool is_initial_navigation_; 381 bool is_initial_navigation_;
385 382
386 // Used to find the appropriate SessionStorageNamespace for the storage 383 // Used to find the appropriate SessionStorageNamespace for the storage
387 // partition of a NavigationEntry. 384 // partition of a NavigationEntry.
388 // 385 //
389 // A NavigationController may contain NavigationEntries that correspond to 386 // A NavigationController may contain NavigationEntries that correspond to
390 // different StoragePartitions. Even though they are part of the same 387 // different StoragePartitions. Even though they are part of the same
391 // NavigationController, only entries in the same StoragePartition may 388 // NavigationController, only entries in the same StoragePartition may
392 // share session storage state with one another. 389 // share session storage state with one another.
393 SessionStorageNamespaceMap session_storage_namespace_map_; 390 SessionStorageNamespaceMap session_storage_namespace_map_;
(...skipping 23 matching lines...) Expand all
417 // the timer resolution, leading to things sometimes showing up in 414 // the timer resolution, leading to things sometimes showing up in
418 // the wrong order in the history view. 415 // the wrong order in the history view.
419 TimeSmoother time_smoother_; 416 TimeSmoother time_smoother_;
420 417
421 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 418 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
422 }; 419 };
423 420
424 } // namespace content 421 } // namespace content
425 422
426 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 423 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/web_contents/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698