chrome/browser/ui/webui/options/options_handlers_helper.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

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/webui/options/options_handlers_helper.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type

Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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

« no previous file with comments | « chrome/browser/ui/webui/options/options_handlers_helper.h ('k') | chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "base/bind.h"	5 #include "base/bind.h"

6 #include "chrome/browser/browser_process.h"	6 #include "chrome/browser/browser_process.h"

7 #include "chrome/browser/profiles/profile_manager.h"	7 #include "chrome/browser/profiles/profile_manager.h"

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

9 #include "chrome/browser/profiles/profile_window.h"	9 #include "chrome/browser/profiles/profile_window.h"

10 #include "chrome/browser/profiles/profiles_state.h"	10 #include "chrome/browser/profiles/profiles_state.h"

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

	12 #include "chrome/browser/ui/host_desktop.h"

12 #include "content/public/browser/web_contents.h"	13 #include "content/public/browser/web_contents.h"

13 #include "content/public/browser/web_ui.h"	14 #include "content/public/browser/web_ui.h"

14 #include "extensions/browser/app_window/app_window.h"	15 #include "extensions/browser/app_window/app_window.h"

15 #include "extensions/browser/app_window/app_window_registry.h"	16 #include "extensions/browser/app_window/app_window_registry.h"

16	17

17 namespace options {	18 namespace options {

18 namespace helper {	19 namespace helper {

19	20

20 ui::HostDesktopType GetDesktopType(content::WebUI* web_ui) {	21 ui::HostDesktopType GetDesktopType(content::WebUI* web_ui) {

21 DCHECK(web_ui);	22 DCHECK(web_ui);

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57	58

58 ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS);	59 ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS);

59	60

60 g_browser_process->profile_manager()->ScheduleProfileForDeletion(	61 g_browser_process->profile_manager()->ScheduleProfileForDeletion(

61 file_path,	62 file_path,

62 base::Bind(&OpenNewWindowForProfile, GetDesktopType(web_ui)));	63 base::Bind(&OpenNewWindowForProfile, GetDesktopType(web_ui)));

63 }	64 }

64	65

65 } // namespace helper	66 } // namespace helper

66 } // namespace options	67 } // namespace options

OLD	NEW