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

Side by Side Diff: ui/views/controls/webview/web_dialog_view.h

Issue 812763003: Fix browser launch on the login screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused parameters. Created 5 years, 12 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
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 content::WebContents* new_contents, 104 content::WebContents* new_contents,
105 WindowOpenDisposition disposition, 105 WindowOpenDisposition disposition,
106 const gfx::Rect& initial_pos, 106 const gfx::Rect& initial_pos,
107 bool user_gesture, 107 bool user_gesture,
108 bool* was_blocked) override; 108 bool* was_blocked) override;
109 void LoadingStateChanged(content::WebContents* source, 109 void LoadingStateChanged(content::WebContents* source,
110 bool to_different_document) override; 110 bool to_different_document) override;
111 void BeforeUnloadFired(content::WebContents* tab, 111 void BeforeUnloadFired(content::WebContents* tab,
112 bool proceed, 112 bool proceed,
113 bool* proceed_to_fire_unload) override; 113 bool* proceed_to_fire_unload) override;
114 bool ShouldCreateWebContents(
115 content::WebContents* web_contents,
116 int route_id,
117 int main_frame_route_id,
118 WindowContainerType window_container_type,
119 const base::string16& frame_name,
120 const GURL& target_url,
121 const std::string& partition_id,
122 content::SessionStorageNamespace* session_storage_namespace) override;
114 123
115 private: 124 private:
116 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered); 125 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);
117 126
118 // Initializes the contents of the dialog. 127 // Initializes the contents of the dialog.
119 void InitDialog(); 128 void InitDialog();
120 129
121 // This view is a delegate to the HTML content since it needs to get notified 130 // This view is a delegate to the HTML content since it needs to get notified
122 // about when the dialog is closing. For all other actions (besides dialog 131 // about when the dialog is closing. For all other actions (besides dialog
123 // closing) we delegate to the creator of this view, which we keep track of 132 // closing) we delegate to the creator of this view, which we keep track of
(...skipping 19 matching lines...) Expand all
143 152
144 // Whether CloseContents() has been called. 153 // Whether CloseContents() has been called.
145 bool close_contents_called_; 154 bool close_contents_called_;
146 155
147 DISALLOW_COPY_AND_ASSIGN(WebDialogView); 156 DISALLOW_COPY_AND_ASSIGN(WebDialogView);
148 }; 157 };
149 158
150 } // namespace views 159 } // namespace views
151 160
152 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 161 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698