chrome/browser/ui/views/html_dialog_view.cc - Issue 5046002: Cleanup: Include browser.h -> ui/browser.h [Part 2].

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 5046002: Cleanup: Include browser.h -> ui/browser.h [Part 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/instant_confirm_view.cc » ('j') | no next file with comments »

OLD	NEW
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 "app/keyboard_codes.h"	7 #include "app/keyboard_codes.h"

8 #include "chrome/browser/browser.h"

9 #include "chrome/browser/tab_contents/tab_contents.h"	8 #include "chrome/browser/tab_contents/tab_contents.h"

	9 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/views/window.h"	10 #include "chrome/browser/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

(...skipping 190 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
210 // Set the delegate. This must be done before loading the page. See	210 // Set the delegate. This must be done before loading the page. See

211 // the comment above HtmlDialogUI in its header file for why.	211 // the comment above HtmlDialogUI in its header file for why.

212 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(),	212 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(),

213 this);	213 this);

214	214

215 // Pressing the ESC key will close the dialog.	215 // Pressing the ESC key will close the dialog.

216 AddAccelerator(views::Accelerator(app::VKEY_ESCAPE, false, false, false));	216 AddAccelerator(views::Accelerator(app::VKEY_ESCAPE, false, false, false));

217	217

218 DOMView::LoadURL(GetDialogContentURL());	218 DOMView::LoadURL(GetDialogContentURL());

219 }	219 }

OLD	NEW