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

Unified Diff: content/shell/browser/shell.h

Issue 161113002: Fix pushState causing stop/reload button and favicon to flicker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell.h
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index 5248199eebbe40c14d26611e0c018783f674160d..1156f21d89cdfddf7f652e419110c8c1d8d6c45f 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -65,7 +65,7 @@ class Shell : public WebContentsDelegate,
void GoBackOrForward(int offset);
void Reload();
void Stop();
- void UpdateNavigationControls();
+ void UpdateNavigationControls(bool to_different_document);
void Close();
void ShowDevTools();
void ShowDevToolsForElementAt(int x, int y);
@@ -119,7 +119,8 @@ class Shell : public WebContentsDelegate,
const gfx::Rect& initial_pos,
bool user_gesture,
bool* was_blocked) OVERRIDE;
- virtual void LoadingStateChanged(WebContents* source) OVERRIDE;
+ virtual void LoadingStateChanged(WebContents* source,
+ bool to_different_document) OVERRIDE;
#if defined(OS_ANDROID)
virtual void LoadProgressChanged(WebContents* source,
double progress) OVERRIDE;
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698