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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 175543005: Use the single argument overload of WebFrame::create(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 ShouldUseAcceleratedCompositingForScrollableFrames(device_scale_factor_)); 825 ShouldUseAcceleratedCompositingForScrollableFrames(device_scale_factor_));
826 webview()->settings()->setCompositedScrollingForFramesEnabled( 826 webview()->settings()->setCompositedScrollingForFramesEnabled(
827 ShouldUseCompositedScrollingForFrames(device_scale_factor_)); 827 ShouldUseCompositedScrollingForFrames(device_scale_factor_));
828 828
829 ApplyWebPreferences(webkit_preferences_, webview()); 829 ApplyWebPreferences(webkit_preferences_, webview());
830 830
831 main_render_frame_.reset( 831 main_render_frame_.reset(
832 RenderFrameImpl::Create(this, params->main_frame_routing_id)); 832 RenderFrameImpl::Create(this, params->main_frame_routing_id));
833 // The main frame WebFrame object is closed by 833 // The main frame WebFrame object is closed by
834 // RenderFrameImpl::frameDetached(). 834 // RenderFrameImpl::frameDetached().
835 webview()->setMainFrame(WebFrame::create(main_render_frame_.get(), 835 webview()->setMainFrame(WebFrame::create(main_render_frame_.get()));
836 params->main_frame_routing_id));
837 main_render_frame_->SetWebFrame(webview()->mainFrame()); 836 main_render_frame_->SetWebFrame(webview()->mainFrame());
838 837
839 if (switches::IsTouchDragDropEnabled()) 838 if (switches::IsTouchDragDropEnabled())
840 webview()->settings()->setTouchDragDropEnabled(true); 839 webview()->settings()->setTouchDragDropEnabled(true);
841 840
842 if (switches::IsTouchEditingEnabled()) 841 if (switches::IsTouchEditingEnabled())
843 webview()->settings()->setTouchEditingEnabled(true); 842 webview()->settings()->setTouchEditingEnabled(true);
844 843
845 if (!params->frame_name.empty()) 844 if (!params->frame_name.empty())
846 webview()->mainFrame()->setName(params->frame_name); 845 webview()->mainFrame()->setName(params->frame_name);
(...skipping 4701 matching lines...) Expand 10 before | Expand all | Expand 10 after
5548 for (size_t i = 0; i < icon_urls.size(); i++) { 5547 for (size_t i = 0; i < icon_urls.size(); i++) {
5549 WebURL url = icon_urls[i].iconURL(); 5548 WebURL url = icon_urls[i].iconURL();
5550 if (!url.isEmpty()) 5549 if (!url.isEmpty())
5551 urls.push_back(FaviconURL(url, 5550 urls.push_back(FaviconURL(url,
5552 ToFaviconType(icon_urls[i].iconType()))); 5551 ToFaviconType(icon_urls[i].iconType())));
5553 } 5552 }
5554 SendUpdateFaviconURL(urls); 5553 SendUpdateFaviconURL(urls);
5555 } 5554 }
5556 5555
5557 } // namespace content 5556 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698