chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, 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/tab_modal_confirm_dialog_views.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/ui/views/tab_contents/render_view_context_menu_views.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/ui/views/tab_modal_confirm_dialog_views.h"	5 #include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

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

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

10 #include "chrome/browser/ui/browser_window.h"	10 #include "chrome/browser/ui/browser_window.h"

11 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"	11 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"

12 #include "chrome/browser/ui/views/constrained_window_views.h"	12 #include "chrome/browser/ui/views/constrained_window_views.h"

13 #include "chrome/common/chrome_switches.h"	13 #include "chrome/common/chrome_switches.h"

14 #include "components/web_modal/web_contents_modal_dialog_manager.h"	14 #include "components/web_modal/web_contents_modal_dialog_manager.h"

15 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"	15 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"

16 #include "content/public/browser/web_contents.h"	16 #include "content/public/browser/web_contents.h"

17 #include "content/public/browser/web_contents_view.h"	17 #include "content/public/browser/web_contents_view.h"

(...skipping 102 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 delete this;	120 delete this;

121 }	121 }

122	122

123 ui::ModalType TabModalConfirmDialogViews::GetModalType() const {	123 ui::ModalType TabModalConfirmDialogViews::GetModalType() const {

124 #if defined(USE_ASH)	124 #if defined(USE_ASH)

125 return ui::MODAL_TYPE_CHILD;	125 return ui::MODAL_TYPE_CHILD;

126 #else	126 #else

127 return views::WidgetDelegate::GetModalType();	127 return views::WidgetDelegate::GetModalType();

128 #endif	128 #endif

129 }	129 }

OLD	NEW