| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 1796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1807 view->set_waiting_for_create_window_ack(true); | 1807 view->set_waiting_for_create_window_ack(true); |
| 1808 | 1808 |
| 1809 // Copy over the alternate error page URL so we can have alt error pages in | 1809 // Copy over the alternate error page URL so we can have alt error pages in |
| 1810 // the new render view (we don't need the browser to send the URL back down). | 1810 // the new render view (we don't need the browser to send the URL back down). |
| 1811 view->alternate_error_page_url_ = alternate_error_page_url_; | 1811 view->alternate_error_page_url_ = alternate_error_page_url_; |
| 1812 | 1812 |
| 1813 return view->webview(); | 1813 return view->webview(); |
| 1814 } | 1814 } |
| 1815 | 1815 |
| 1816 WebWidget* RenderView::CreatePopupWidget(WebView* webview, | 1816 WebWidget* RenderView::CreatePopupWidget(WebView* webview, |
| 1817 bool focus_on_show) { | 1817 bool activatable) { |
| 1818 RenderWidget* widget = RenderWidget::Create(routing_id_, | 1818 RenderWidget* widget = RenderWidget::Create(routing_id_, |
| 1819 render_thread_, | 1819 render_thread_, |
| 1820 focus_on_show); | 1820 activatable); |
| 1821 return widget->webwidget(); | 1821 return widget->webwidget(); |
| 1822 } | 1822 } |
| 1823 | 1823 |
| 1824 static bool ShouldLoadPluginInProcess(const std::string& mime_type, | 1824 static bool ShouldLoadPluginInProcess(const std::string& mime_type, |
| 1825 bool* is_gears) { | 1825 bool* is_gears) { |
| 1826 if (RenderProcess::ShouldLoadPluginsInProcess()) | 1826 if (RenderProcess::ShouldLoadPluginsInProcess()) |
| 1827 return true; | 1827 return true; |
| 1828 | 1828 |
| 1829 if (mime_type == "application/x-googlegears") { | 1829 if (mime_type == "application/x-googlegears") { |
| 1830 *is_gears = true; | 1830 *is_gears = true; |
| (...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2762 template_resource_id)); | 2762 template_resource_id)); |
| 2763 | 2763 |
| 2764 if (template_html.empty()) { | 2764 if (template_html.empty()) { |
| 2765 NOTREACHED() << "unable to load template. ID: " << template_resource_id; | 2765 NOTREACHED() << "unable to load template. ID: " << template_resource_id; |
| 2766 return ""; | 2766 return ""; |
| 2767 } | 2767 } |
| 2768 // "t" is the id of the templates root node. | 2768 // "t" is the id of the templates root node. |
| 2769 return jstemplate_builder::GetTemplateHtml( | 2769 return jstemplate_builder::GetTemplateHtml( |
| 2770 template_html, &error_strings, "t"); | 2770 template_html, &error_strings, "t"); |
| 2771 } | 2771 } |
| OLD | NEW |