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

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

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 1 month 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 const gfx::Rect& initial_rect, 106 const gfx::Rect& initial_rect,
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( 114 bool ShouldCreateWebContents(
115 content::WebContents* web_contents, 115 content::WebContents* web_contents,
116 int route_id, 116 int32_t route_id,
117 int main_frame_route_id, 117 int32_t main_frame_route_id,
118 int32_t main_frame_widget_route_id,
118 WindowContainerType window_container_type, 119 WindowContainerType window_container_type,
119 const std::string& frame_name, 120 const std::string& frame_name,
120 const GURL& target_url, 121 const GURL& target_url,
121 const std::string& partition_id, 122 const std::string& partition_id,
122 content::SessionStorageNamespace* session_storage_namespace) override; 123 content::SessionStorageNamespace* session_storage_namespace) override;
123 124
124 private: 125 private:
125 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered); 126 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);
126 127
127 // Initializes the contents of the dialog. 128 // Initializes the contents of the dialog.
(...skipping 24 matching lines...) Expand all
152 153
153 // Whether CloseContents() has been called. 154 // Whether CloseContents() has been called.
154 bool close_contents_called_; 155 bool close_contents_called_;
155 156
156 DISALLOW_COPY_AND_ASSIGN(WebDialogView); 157 DISALLOW_COPY_AND_ASSIGN(WebDialogView);
157 }; 158 };
158 159
159 } // namespace views 160 } // namespace views
160 161
161 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 162 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698