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

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: Small cleanup/refactor Created 7 years, 1 month 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 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1363 // The ack for the mouse down won't come until the dialog closes, so fake it 1363 // The ack for the mouse down won't come until the dialog closes, so fake it
1364 // so that we don't get a timeout. 1364 // so that we don't get a timeout.
1365 opener->decrement_in_flight_event_count(); 1365 opener->decrement_in_flight_event_count();
1366 } 1366 }
1367 1367
1368 // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in 1368 // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in
1369 // an app-modal fashion. 1369 // an app-modal fashion.
1370 } 1370 }
1371 1371
1372 void RenderViewHostImpl::OnRenderViewReady() { 1372 void RenderViewHostImpl::OnRenderViewReady() {
1373 GetContentClient()->browser()->RenderViewReady(this);
1373 render_view_termination_status_ = base::TERMINATION_STATUS_STILL_RUNNING; 1374 render_view_termination_status_ = base::TERMINATION_STATUS_STILL_RUNNING;
1374 SendScreenRects(); 1375 SendScreenRects();
1375 WasResized(); 1376 WasResized();
1376 delegate_->RenderViewReady(this); 1377 delegate_->RenderViewReady(this);
1377 } 1378 }
1378 1379
1379 void RenderViewHostImpl::OnRenderProcessGone(int status, int exit_code) { 1380 void RenderViewHostImpl::OnRenderProcessGone(int status, int exit_code) {
1380 // Keep the termination status so we can get at it later when we 1381 // Keep the termination status so we can get at it later when we
1381 // need to know why it died. 1382 // need to know why it died.
1382 render_view_termination_status_ = 1383 render_view_termination_status_ =
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
2278 void RenderViewHostImpl::AttachToFrameTree() { 2279 void RenderViewHostImpl::AttachToFrameTree() {
2279 FrameTree* frame_tree = delegate_->GetFrameTree(); 2280 FrameTree* frame_tree = delegate_->GetFrameTree();
2280 2281
2281 frame_tree->SwapMainFrame(main_render_frame_host_.get()); 2282 frame_tree->SwapMainFrame(main_render_frame_host_.get());
2282 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { 2283 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) {
2283 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); 2284 frame_tree->OnFirstNavigationAfterSwap(main_frame_id());
2284 } 2285 }
2285 } 2286 }
2286 2287
2287 } // namespace content 2288 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698