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

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

Issue 287093002: Remove ViewMsg_SetZoomLevel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add std:: namespace to find() to fix Android compile. Created 6 years, 6 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/public/browser/web_contents.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2026 matching lines...) Expand 10 before | Expand all | Expand 10 after
2037 } 2037 }
2038 2038
2039 void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) { 2039 void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
2040 DCHECK(!frame_ || frame_ == frame); 2040 DCHECK(!frame_ || frame_ == frame);
2041 2041
2042 // Notify the browser about non-blank documents loading in the top frame. 2042 // Notify the browser about non-blank documents loading in the top frame.
2043 GURL url = frame->document().url(); 2043 GURL url = frame->document().url();
2044 if (url.is_valid() && url.spec() != kAboutBlankURL) { 2044 if (url.is_valid() && url.spec() != kAboutBlankURL) {
2045 // TODO(nasko): Check if webview()->mainFrame() is the same as the 2045 // TODO(nasko): Check if webview()->mainFrame() is the same as the
2046 // frame->tree()->top(). 2046 // frame->tree()->top().
2047 if (frame == render_view_->webview()->mainFrame()) { 2047 blink::WebFrame* main_frame = render_view_->webview()->mainFrame();
2048 if (frame == main_frame) {
2049 // For now, don't remember plugin zoom values. We don't want to mix them
2050 // with normal web content (i.e. a fixed layout plugin would usually want
2051 // them different).
2048 render_view_->Send(new ViewHostMsg_DocumentAvailableInMainFrame( 2052 render_view_->Send(new ViewHostMsg_DocumentAvailableInMainFrame(
2049 render_view_->GetRoutingID())); 2053 render_view_->GetRoutingID(),
2054 main_frame->document().isPluginDocument()));
2050 } 2055 }
2051 } 2056 }
2052 2057
2053 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), 2058 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
2054 DidCreateDocumentElement(frame)); 2059 DidCreateDocumentElement(frame));
2055 } 2060 }
2056 2061
2057 void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame, 2062 void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame,
2058 const blink::WebString& title, 2063 const blink::WebString& title,
2059 blink::WebTextDirection direction) { 2064 blink::WebTextDirection direction) {
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
3535 3540
3536 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3541 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3537 if (!cdm_manager_) 3542 if (!cdm_manager_)
3538 cdm_manager_ = new RendererCdmManager(this); 3543 cdm_manager_ = new RendererCdmManager(this);
3539 return cdm_manager_; 3544 return cdm_manager_;
3540 } 3545 }
3541 3546
3542 #endif // defined(OS_ANDROID) 3547 #endif // defined(OS_ANDROID)
3543 3548
3544 } // namespace content 3549 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/web_contents.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698