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

Side by Side Diff: chrome/browser/chromeos/login/simple_web_view_dialog.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: Rebase 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 unified diff | Download patch | Annotate | Revision Log
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 CHROME_BROWSER_CHROMEOS_LOGIN_SIMPLE_WEB_VIEW_DIALOG_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIMPLE_WEB_VIEW_DIALOG_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIMPLE_WEB_VIEW_DIALOG_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIMPLE_WEB_VIEW_DIALOG_H_
7 7
8 #include <string> 8 #include <string>
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/command_updater_delegate.h" 10 #include "chrome/browser/command_updater_delegate.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 // Implements views::ButtonListener: 62 // Implements views::ButtonListener:
63 virtual void ButtonPressed(views::Button* sender, 63 virtual void ButtonPressed(views::Button* sender,
64 const ui::Event& event) OVERRIDE; 64 const ui::Event& event) OVERRIDE;
65 65
66 // Implements content::PageNavigator: 66 // Implements content::PageNavigator:
67 virtual content::WebContents* OpenURL( 67 virtual content::WebContents* OpenURL(
68 const content::OpenURLParams& params) OVERRIDE; 68 const content::OpenURLParams& params) OVERRIDE;
69 69
70 // Implements content::WebContentsDelegate: 70 // Implements content::WebContentsDelegate:
71 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; 71 virtual void LoadingStateChanged(content::WebContents* source,
72 bool to_different_document) OVERRIDE;
72 73
73 // Implements LocationBarView::Delegate: 74 // Implements LocationBarView::Delegate:
74 virtual void NavigationStateChanged(const content::WebContents* source, 75 virtual void NavigationStateChanged(const content::WebContents* source,
75 unsigned changed_flags) OVERRIDE; 76 unsigned changed_flags) OVERRIDE;
76 virtual content::WebContents* GetWebContents() OVERRIDE; 77 virtual content::WebContents* GetWebContents() OVERRIDE;
77 virtual ToolbarModel* GetToolbarModel() OVERRIDE; 78 virtual ToolbarModel* GetToolbarModel() OVERRIDE;
78 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE; 79 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE;
79 virtual InstantController* GetInstant() OVERRIDE; 80 virtual InstantController* GetInstant() OVERRIDE;
80 virtual views::Widget* CreateViewsBubble( 81 virtual views::Widget* CreateViewsBubble(
81 views::BubbleDelegateView* bubble_delegate) OVERRIDE; 82 views::BubbleDelegateView* bubble_delegate) OVERRIDE;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 scoped_ptr<views::WebView> web_view_container_; 118 scoped_ptr<views::WebView> web_view_container_;
118 119
119 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_; 120 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_;
120 121
121 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog); 122 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog);
122 }; 123 };
123 124
124 } // namespace chromeos 125 } // namespace chromeos
125 126
126 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIMPLE_WEB_VIEW_DIALOG_H_ 127 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIMPLE_WEB_VIEW_DIALOG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698