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

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

Issue 232463007: Don't leave aborted URLs in the omnibox unless we're on a new tab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix and add tests. Created 6 years, 8 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_NAVIGATION_CONTROLLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 virtual void NotifyEntryChanged(const NavigationEntry* entry, 87 virtual void NotifyEntryChanged(const NavigationEntry* entry,
88 int index) OVERRIDE; 88 int index) OVERRIDE;
89 virtual void CopyStateFrom( 89 virtual void CopyStateFrom(
90 const NavigationController& source) OVERRIDE; 90 const NavigationController& source) OVERRIDE;
91 virtual void CopyStateFromAndPrune(NavigationController* source, 91 virtual void CopyStateFromAndPrune(NavigationController* source,
92 bool replace_entry) OVERRIDE; 92 bool replace_entry) OVERRIDE;
93 virtual bool CanPruneAllButLastCommitted() OVERRIDE; 93 virtual bool CanPruneAllButLastCommitted() OVERRIDE;
94 virtual void PruneAllButLastCommitted() OVERRIDE; 94 virtual void PruneAllButLastCommitted() OVERRIDE;
95 virtual void ClearAllScreenshots() OVERRIDE; 95 virtual void ClearAllScreenshots() OVERRIDE;
96 96
97 // Whether this is the initial navigation in an unmodified new tab. In this
98 // case, we know there is no content displayed in the page.
99 bool IsUnmodifiedBlankTab() const;
Charlie Reis 2014/04/18 01:23:53 I abstracted this out so I could use it in both Ge
100
97 // The session storage namespace that all child RenderViews belonging to 101 // The session storage namespace that all child RenderViews belonging to
98 // |instance| should use. 102 // |instance| should use.
99 SessionStorageNamespace* GetSessionStorageNamespace( 103 SessionStorageNamespace* GetSessionStorageNamespace(
100 SiteInstance* instance); 104 SiteInstance* instance);
101 105
102 // Returns the index of the specified entry, or -1 if entry is not contained 106 // Returns the index of the specified entry, or -1 if entry is not contained
103 // in this NavigationController. 107 // in this NavigationController.
104 int GetIndexOfEntry(const NavigationEntryImpl* entry) const; 108 int GetIndexOfEntry(const NavigationEntryImpl* entry) const;
105 109
106 // Return the index of the entry with the corresponding instance and page_id, 110 // Return the index of the entry with the corresponding instance and page_id,
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 TimeSmoother time_smoother_; 417 TimeSmoother time_smoother_;
414 418
415 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_; 419 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_;
416 420
417 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 421 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
418 }; 422 };
419 423
420 } // namespace content 424 } // namespace content
421 425
422 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 426 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698