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

Side by Side Diff: chrome/browser/modal_html_dialog_delegate.cc

Issue 3145001: FBTF: Clean up task.h in x11_util.h and header usage in some delegates. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: more Created 10 years, 4 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/modal_html_dialog_delegate.h" 5 #include "chrome/browser/modal_html_dialog_delegate.h"
6 6
7 #include "chrome/browser/browser_list.h" 7 #include "chrome/browser/browser_list.h"
8 #include "chrome/browser/renderer_host/render_view_host.h" 8 #include "chrome/browser/renderer_host/render_view_host.h"
9 #include "chrome/browser/tab_contents/tab_contents.h" 9 #include "chrome/browser/tab_contents/tab_contents.h"
10 #include "chrome/common/notification_service.h" 10 #include "chrome/common/notification_service.h"
11 #include "gfx/size.h"
11 12
12 ModalHtmlDialogDelegate::ModalHtmlDialogDelegate( 13 ModalHtmlDialogDelegate::ModalHtmlDialogDelegate(
13 const GURL& url, int width, int height, const std::string& json_arguments, 14 const GURL& url, int width, int height, const std::string& json_arguments,
14 IPC::Message* sync_result, TabContents* contents) 15 IPC::Message* sync_result, TabContents* contents)
15 : contents_(contents), 16 : contents_(contents),
16 sync_response_(sync_result) { 17 sync_response_(sync_result) {
17 // Listen for when the TabContents or its renderer dies. 18 // Listen for when the TabContents or its renderer dies.
18 registrar_.Add(this, NotificationType::TAB_CONTENTS_DISCONNECTED, 19 registrar_.Add(this, NotificationType::TAB_CONTENTS_DISCONNECTED,
19 Source<TabContents>(contents_)); 20 Source<TabContents>(contents_));
20 21
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 void ModalHtmlDialogDelegate::OnDialogClosed(const std::string& json_retval) { 58 void ModalHtmlDialogDelegate::OnDialogClosed(const std::string& json_retval) {
58 // Our TabContents may have died before this point. 59 // Our TabContents may have died before this point.
59 if (contents_ && contents_->render_view_host()) { 60 if (contents_ && contents_->render_view_host()) {
60 contents_->render_view_host()->ModalHTMLDialogClosed(sync_response_, 61 contents_->render_view_host()->ModalHTMLDialogClosed(sync_response_,
61 json_retval); 62 json_retval);
62 } 63 }
63 64
64 // We are done with this request, so delete us. 65 // We are done with this request, so delete us.
65 delete this; 66 delete this;
66 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/modal_html_dialog_delegate.h ('k') | chrome/browser/speech/speech_input_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698