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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.cc

Issue 149143: Fix showModalDialog regression. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | « chrome/browser/browser_uitest.cc ('k') | chrome/test/data/showmodaldialog.html » ('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 (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/browser/renderer_host/render_view_host.h" 5 #include "chrome/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); 811 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
812 if (view) { 812 if (view) {
813 view->ShowCreatedWidget(route_id, initial_pos); 813 view->ShowCreatedWidget(route_id, initial_pos);
814 Send(new ViewMsg_Move_ACK(route_id)); 814 Send(new ViewMsg_Move_ACK(route_id));
815 } 815 }
816 } 816 }
817 817
818 void RenderViewHost::OnMsgRunModal(IPC::Message* reply_msg) { 818 void RenderViewHost::OnMsgRunModal(IPC::Message* reply_msg) {
819 DCHECK(!run_modal_reply_msg_); 819 DCHECK(!run_modal_reply_msg_);
820 if (modal_dialog_count_++ == 0) 820 if (modal_dialog_count_++ == 0)
821 modal_dialog_event_->Reset(); 821 modal_dialog_event_->Signal();
822 run_modal_reply_msg_ = reply_msg; 822 run_modal_reply_msg_ = reply_msg;
823 823
824 // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in 824 // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in
825 // an app-modal fashion. 825 // an app-modal fashion.
826 } 826 }
827 827
828 void RenderViewHost::OnMsgRenderViewReady() { 828 void RenderViewHost::OnMsgRenderViewReady() {
829 WasResized(); 829 WasResized();
830 delegate_->RenderViewReady(this); 830 delegate_->RenderViewReady(this);
831 } 831 }
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 BrowserAccessibilityManager::GetInstance()-> 1390 BrowserAccessibilityManager::GetInstance()->
1391 ChangeAccessibilityFocus(acc_obj_id, process()->pid(), routing_id()); 1391 ChangeAccessibilityFocus(acc_obj_id, process()->pid(), routing_id());
1392 #else 1392 #else
1393 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288. 1393 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
1394 #endif 1394 #endif
1395 } 1395 }
1396 1396
1397 void RenderViewHost::OnCSSInserted() { 1397 void RenderViewHost::OnCSSInserted() {
1398 delegate_->DidInsertCSS(); 1398 delegate_->DidInsertCSS();
1399 } 1399 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_uitest.cc ('k') | chrome/test/data/showmodaldialog.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698