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

Side by Side Diff: ui/views/controls/webview/web_dialog_view.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, 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
« no previous file with comments | « content/test/test_web_contents.cc ('k') | ui/views/controls/webview/web_dialog_view.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 UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 virtual void CloseContents(content::WebContents* source) OVERRIDE; 103 virtual void CloseContents(content::WebContents* source) OVERRIDE;
104 virtual content::WebContents* OpenURLFromTab( 104 virtual content::WebContents* OpenURLFromTab(
105 content::WebContents* source, 105 content::WebContents* source,
106 const content::OpenURLParams& params) OVERRIDE; 106 const content::OpenURLParams& params) OVERRIDE;
107 virtual void AddNewContents(content::WebContents* source, 107 virtual void AddNewContents(content::WebContents* source,
108 content::WebContents* new_contents, 108 content::WebContents* new_contents,
109 WindowOpenDisposition disposition, 109 WindowOpenDisposition disposition,
110 const gfx::Rect& initial_pos, 110 const gfx::Rect& initial_pos,
111 bool user_gesture, 111 bool user_gesture,
112 bool* was_blocked) OVERRIDE; 112 bool* was_blocked) OVERRIDE;
113 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; 113 virtual void LoadingStateChanged(content::WebContents* source,
114 bool to_different_document) OVERRIDE;
114 virtual void BeforeUnloadFired(content::WebContents* tab, 115 virtual void BeforeUnloadFired(content::WebContents* tab,
115 bool proceed, 116 bool proceed,
116 bool* proceed_to_fire_unload) OVERRIDE; 117 bool* proceed_to_fire_unload) OVERRIDE;
117 118
118 private: 119 private:
119 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered); 120 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);
120 121
121 // Initializes the contents of the dialog. 122 // Initializes the contents of the dialog.
122 void InitDialog(); 123 void InitDialog();
123 124
(...skipping 27 matching lines...) Expand all
151 152
152 // Whether CloseContents() has been called. 153 // Whether CloseContents() has been called.
153 bool close_contents_called_; 154 bool close_contents_called_;
154 155
155 DISALLOW_COPY_AND_ASSIGN(WebDialogView); 156 DISALLOW_COPY_AND_ASSIGN(WebDialogView);
156 }; 157 };
157 158
158 } // namespace views 159 } // namespace views
159 160
160 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 161 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
OLDNEW
« no previous file with comments | « content/test/test_web_contents.cc ('k') | ui/views/controls/webview/web_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698