OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1877 } | 1877 } |
1878 | 1878 |
1879 // The WebView holds a reference to this new RenderView | 1879 // The WebView holds a reference to this new RenderView |
1880 base::WaitableEvent* waitable_event = new base::WaitableEvent | 1880 base::WaitableEvent* waitable_event = new base::WaitableEvent |
1881 #if defined(OS_WIN) | 1881 #if defined(OS_WIN) |
1882 (modal_dialog_event.event); | 1882 (modal_dialog_event.event); |
1883 #else | 1883 #else |
1884 (true, false); | 1884 (true, false); |
1885 #endif | 1885 #endif |
1886 RenderView* view = RenderView::Create(render_thread_, | 1886 RenderView* view = RenderView::Create(render_thread_, |
1887 0, waitable_event, routing_id_, | 1887 NULL, waitable_event, routing_id_, |
1888 renderer_preferences_, | 1888 renderer_preferences_, |
1889 webkit_preferences_, | 1889 webkit_preferences_, |
1890 shared_popup_counter_, routing_id); | 1890 shared_popup_counter_, routing_id); |
1891 view->opened_by_user_gesture_ = user_gesture; | 1891 view->opened_by_user_gesture_ = user_gesture; |
1892 view->creator_url_ = creator_url; | 1892 view->creator_url_ = creator_url; |
1893 | 1893 |
1894 // Copy over the alternate error page URL so we can have alt error pages in | 1894 // Copy over the alternate error page URL so we can have alt error pages in |
1895 // the new render view (we don't need the browser to send the URL back down). | 1895 // the new render view (we don't need the browser to send the URL back down). |
1896 view->alternate_error_page_url_ = alternate_error_page_url_; | 1896 view->alternate_error_page_url_ = alternate_error_page_url_; |
1897 | 1897 |
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3341 Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms)); | 3341 Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms)); |
3342 } | 3342 } |
3343 | 3343 |
3344 void RenderView::Print(WebFrame* frame, bool script_initiated) { | 3344 void RenderView::Print(WebFrame* frame, bool script_initiated) { |
3345 DCHECK(frame); | 3345 DCHECK(frame); |
3346 if (print_helper_.get() == NULL) { | 3346 if (print_helper_.get() == NULL) { |
3347 print_helper_.reset(new PrintWebViewHelper(this)); | 3347 print_helper_.reset(new PrintWebViewHelper(this)); |
3348 } | 3348 } |
3349 print_helper_->Print(frame, script_initiated); | 3349 print_helper_->Print(frame, script_initiated); |
3350 } | 3350 } |
OLD | NEW |