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

Side by Side Diff: chrome/browser/views/html_dialog_view.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/views/html_dialog_view.h" 5 #include "chrome/browser/views/html_dialog_view.h"
6 6
7 #include "base/keyboard_codes.h" 7 #include "base/keyboard_codes.h"
8 #include "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/tab_contents/tab_contents.h" 9 #include "chrome/browser/tab_contents/tab_contents.h"
10 #include "chrome/common/native_web_keyboard_event.h"
10 #include "views/widget/root_view.h" 11 #include "views/widget/root_view.h"
11 #include "views/widget/widget.h" 12 #include "views/widget/widget.h"
12 #include "views/window/window.h" 13 #include "views/window/window.h"
13 14
14 #if defined(OS_LINUX) 15 #if defined(OS_LINUX)
15 #include "views/window/window_gtk.h" 16 #include "views/window/window_gtk.h"
16 #endif 17 #endif
17 18
18 namespace browser { 19 namespace browser {
19 20
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 // Set the delegate. This must be done before loading the page. See 198 // Set the delegate. This must be done before loading the page. See
198 // the comment above HtmlDialogUI in its header file for why. 199 // the comment above HtmlDialogUI in its header file for why.
199 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(), 200 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(),
200 this); 201 this);
201 202
202 // Pressing the ESC key will close the dialog. 203 // Pressing the ESC key will close the dialog.
203 AddAccelerator(views::Accelerator(base::VKEY_ESCAPE, false, false, false)); 204 AddAccelerator(views::Accelerator(base::VKEY_ESCAPE, false, false, false));
204 205
205 DOMView::LoadURL(GetDialogContentURL()); 206 DOMView::LoadURL(GetDialogContentURL());
206 } 207 }
OLDNEW
« no previous file with comments | « chrome/browser/views/extensions/extension_shelf.cc ('k') | chrome/browser/views/hung_renderer_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698