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

Side by Side Diff: chrome/browser/ui/views/html_dialog_view.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yay, more syncing Created 9 years, 11 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/views/html_dialog_view.h"
6 6
7 #include "app/keyboard_codes.h" 7 #include "app/keyboard_codes.h"
8 #include "chrome/browser/tab_contents/tab_contents.h" 8 #include "chrome/browser/tab_contents/tab_contents.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/views/window.h" 10 #include "chrome/browser/ui/views/window.h"
11 #include "chrome/common/native_web_keyboard_event.h" 11 #include "chrome/common/native_web_keyboard_event.h"
12 #include "views/widget/root_view.h" 12 #include "views/widget/root_view.h"
13 #include "views/widget/widget.h" 13 #include "views/widget/widget.h"
14 #include "views/window/window.h" 14 #include "views/window/window.h"
15 15
16 #if defined(OS_LINUX) 16 #if defined(OS_LINUX)
17 #include "views/window/window_gtk.h" 17 #include "views/window/window_gtk.h"
18 #endif 18 #endif
19 19
20 namespace browser { 20 namespace browser {
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // Set the delegate. This must be done before loading the page. See 211 // Set the delegate. This must be done before loading the page. See
212 // the comment above HtmlDialogUI in its header file for why. 212 // the comment above HtmlDialogUI in its header file for why.
213 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(), 213 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(),
214 this); 214 this);
215 215
216 // Pressing the ESC key will close the dialog. 216 // Pressing the ESC key will close the dialog.
217 AddAccelerator(views::Accelerator(app::VKEY_ESCAPE, false, false, false)); 217 AddAccelerator(views::Accelerator(app::VKEY_ESCAPE, false, false, false));
218 218
219 DOMView::LoadURL(GetDialogContentURL()); 219 DOMView::LoadURL(GetDialogContentURL());
220 } 220 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view.h ('k') | chrome/browser/ui/views/html_dialog_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698