| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 3800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3811 file_chooser_completions_.front()->completion->didChooseFile(ws_file_names); | 3811 file_chooser_completions_.front()->completion->didChooseFile(ws_file_names); |
| 3812 file_chooser_completions_.pop_front(); | 3812 file_chooser_completions_.pop_front(); |
| 3813 | 3813 |
| 3814 // If there are more pending file chooser requests, schedule one now. | 3814 // If there are more pending file chooser requests, schedule one now. |
| 3815 if (!file_chooser_completions_.empty()) { | 3815 if (!file_chooser_completions_.empty()) { |
| 3816 Send(new ViewHostMsg_RunFileChooser(routing_id_, | 3816 Send(new ViewHostMsg_RunFileChooser(routing_id_, |
| 3817 file_chooser_completions_.front()->params)); | 3817 file_chooser_completions_.front()->params)); |
| 3818 } | 3818 } |
| 3819 } | 3819 } |
| 3820 | 3820 |
| 3821 void RenderViewImpl::OnEnablePreferredSizeChangedMode(int flags) { | 3821 void RenderViewImpl::OnEnablePreferredSizeChangedMode() { |
| 3822 DCHECK(flags != kPreferredSizeNothing); | |
| 3823 if (send_preferred_size_changes_) | 3822 if (send_preferred_size_changes_) |
| 3824 return; | 3823 return; |
| 3825 send_preferred_size_changes_ = true; | 3824 send_preferred_size_changes_ = true; |
| 3826 | 3825 |
| 3827 // Start off with an initial preferred size notification (in case | 3826 // Start off with an initial preferred size notification (in case |
| 3828 // |didUpdateLayout| was already called). | 3827 // |didUpdateLayout| was already called). |
| 3829 if (webview()) | 3828 if (webview()) |
| 3830 didUpdateLayout(webview()->mainFrame()); | 3829 didUpdateLayout(webview()->mainFrame()); |
| 3831 } | 3830 } |
| 3832 | 3831 |
| (...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4733 return webview()->settings()->useThreadedCompositor(); | 4732 return webview()->settings()->useThreadedCompositor(); |
| 4734 } | 4733 } |
| 4735 | 4734 |
| 4736 void RenderViewImpl::OnJavaBridgeInit( | 4735 void RenderViewImpl::OnJavaBridgeInit( |
| 4737 const IPC::ChannelHandle& channel_handle) { | 4736 const IPC::ChannelHandle& channel_handle) { |
| 4738 DCHECK(!java_bridge_dispatcher_.get()); | 4737 DCHECK(!java_bridge_dispatcher_.get()); |
| 4739 #if defined(ENABLE_JAVA_BRIDGE) | 4738 #if defined(ENABLE_JAVA_BRIDGE) |
| 4740 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4739 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
| 4741 #endif | 4740 #endif |
| 4742 } | 4741 } |
| OLD | NEW |