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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 78303005: ContentSettings API should not interact with <webview> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits + Added missing file 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
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/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 // The ack for the mouse down won't come until the dialog closes, so fake it 1369 // The ack for the mouse down won't come until the dialog closes, so fake it
1370 // so that we don't get a timeout. 1370 // so that we don't get a timeout.
1371 opener->decrement_in_flight_event_count(); 1371 opener->decrement_in_flight_event_count();
1372 } 1372 }
1373 1373
1374 // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in 1374 // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in
1375 // an app-modal fashion. 1375 // an app-modal fashion.
1376 } 1376 }
1377 1377
1378 void RenderViewHostImpl::OnRenderViewReady() { 1378 void RenderViewHostImpl::OnRenderViewReady() {
1379 GetContentClient()->browser()->RenderViewReady(this);
jam 2013/11/25 22:42:35 this duplicates WebContentsObserver::RenderViewRea
jam 2013/11/25 22:51:53 to expand, you can put this on TabSpecificContentS
1379 render_view_termination_status_ = base::TERMINATION_STATUS_STILL_RUNNING; 1380 render_view_termination_status_ = base::TERMINATION_STATUS_STILL_RUNNING;
1380 SendScreenRects(); 1381 SendScreenRects();
1381 WasResized(); 1382 WasResized();
1382 delegate_->RenderViewReady(this); 1383 delegate_->RenderViewReady(this);
1383 } 1384 }
1384 1385
1385 void RenderViewHostImpl::OnRenderProcessGone(int status, int exit_code) { 1386 void RenderViewHostImpl::OnRenderProcessGone(int status, int exit_code) {
1386 // Keep the termination status so we can get at it later when we 1387 // Keep the termination status so we can get at it later when we
1387 // need to know why it died. 1388 // need to know why it died.
1388 render_view_termination_status_ = 1389 render_view_termination_status_ =
(...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after
2285 void RenderViewHostImpl::AttachToFrameTree() { 2286 void RenderViewHostImpl::AttachToFrameTree() {
2286 FrameTree* frame_tree = delegate_->GetFrameTree(); 2287 FrameTree* frame_tree = delegate_->GetFrameTree();
2287 2288
2288 frame_tree->SwapMainFrame(main_render_frame_host_.get()); 2289 frame_tree->SwapMainFrame(main_render_frame_host_.get());
2289 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { 2290 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) {
2290 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); 2291 frame_tree->OnFirstNavigationAfterSwap(main_frame_id());
2291 } 2292 }
2292 } 2293 }
2293 2294
2294 } // namespace content 2295 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/platform_apps/web_view/shim/main.js ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698