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

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

Issue 104833006: Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years 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
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 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 webview()->settings()->setCompositedScrollingForFramesEnabled( 947 webview()->settings()->setCompositedScrollingForFramesEnabled(
948 ShouldUseCompositedScrollingForFrames(device_scale_factor_)); 948 ShouldUseCompositedScrollingForFrames(device_scale_factor_));
949 949
950 ApplyWebPreferences(webkit_preferences_, webview()); 950 ApplyWebPreferences(webkit_preferences_, webview());
951 951
952 main_render_frame_.reset( 952 main_render_frame_.reset(
953 RenderFrameImpl::Create(this, params->main_frame_routing_id)); 953 RenderFrameImpl::Create(this, params->main_frame_routing_id));
954 // The main frame WebFrame object is closed by 954 // The main frame WebFrame object is closed by
955 // RenderViewImpl::frameDetached(). 955 // RenderViewImpl::frameDetached().
956 webview()->setMainFrame(WebFrame::create(main_render_frame_.get())); 956 webview()->setMainFrame(WebFrame::create(main_render_frame_.get()));
957 main_render_frame_->MainWebFrameCreated(webview()->mainFrame());
957 958
958 if (switches::IsTouchDragDropEnabled()) 959 if (switches::IsTouchDragDropEnabled())
959 webview()->settings()->setTouchDragDropEnabled(true); 960 webview()->settings()->setTouchDragDropEnabled(true);
960 961
961 if (switches::IsTouchEditingEnabled()) 962 if (switches::IsTouchEditingEnabled())
962 webview()->settings()->setTouchEditingEnabled(true); 963 webview()->settings()->setTouchEditingEnabled(true);
963 964
964 if (!params->frame_name.empty()) 965 if (!params->frame_name.empty())
965 webview()->mainFrame()->setName(params->frame_name); 966 webview()->mainFrame()->setName(params->frame_name);
966 967
(...skipping 5500 matching lines...) Expand 10 before | Expand all | Expand 10 after
6467 for (size_t i = 0; i < icon_urls.size(); i++) { 6468 for (size_t i = 0; i < icon_urls.size(); i++) {
6468 WebURL url = icon_urls[i].iconURL(); 6469 WebURL url = icon_urls[i].iconURL();
6469 if (!url.isEmpty()) 6470 if (!url.isEmpty())
6470 urls.push_back(FaviconURL(url, 6471 urls.push_back(FaviconURL(url,
6471 ToFaviconType(icon_urls[i].iconType()))); 6472 ToFaviconType(icon_urls[i].iconType())));
6472 } 6473 }
6473 SendUpdateFaviconURL(urls); 6474 SendUpdateFaviconURL(urls);
6474 } 6475 }
6475 6476
6476 } // namespace content 6477 } // namespace content
OLDNEW
« content/renderer/render_frame_impl.h ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698