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

Side by Side Diff: chrome/browser/ui/webui/options/options_handlers_helper.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS 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
OLDNEW
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 "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "content/public/browser/web_ui.h" 13 #include "content/public/browser/web_ui.h"
14 #include "extensions/browser/app_window/app_window.h" 14 #include "extensions/browser/app_window/app_window.h"
15 #include "extensions/browser/app_window/app_window_registry.h" 15 #include "extensions/browser/app_window/app_window_registry.h"
16 16
17 namespace options { 17 namespace options {
18 namespace helper { 18 namespace helper {
19 19
20 chrome::HostDesktopType GetDesktopType(content::WebUI* web_ui) { 20 ui::HostDesktopType GetDesktopType(content::WebUI* web_ui) {
21 DCHECK(web_ui); 21 DCHECK(web_ui);
22 content::WebContents* web_contents = web_ui->GetWebContents(); 22 content::WebContents* web_contents = web_ui->GetWebContents();
23 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); 23 Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
24 if (browser) 24 if (browser)
25 return browser->host_desktop_type(); 25 return browser->host_desktop_type();
26 26
27 extensions::AppWindow* app_window = 27 extensions::AppWindow* app_window =
28 extensions::AppWindowRegistry::Get(Profile::FromWebUI(web_ui)) 28 extensions::AppWindowRegistry::Get(Profile::FromWebUI(web_ui))
29 ->GetAppWindowForWebContents(web_contents); 29 ->GetAppWindowForWebContents(web_contents);
30 if (app_window) { 30 if (app_window) {
31 return chrome::GetHostDesktopTypeForNativeWindow( 31 return chrome::GetHostDesktopTypeForNativeWindow(
32 app_window->GetNativeWindow()); 32 app_window->GetNativeWindow());
33 } 33 }
34 34
35 return chrome::GetActiveDesktop(); 35 return chrome::GetActiveDesktop();
36 } 36 }
37 37
38 void OpenNewWindowForProfile(chrome::HostDesktopType desktop_type, 38 void OpenNewWindowForProfile(ui::HostDesktopType desktop_type,
39 Profile* profile, 39 Profile* profile,
40 Profile::CreateStatus status) { 40 Profile::CreateStatus status) {
41 if (status != Profile::CREATE_STATUS_INITIALIZED) 41 if (status != Profile::CREATE_STATUS_INITIALIZED)
42 return; 42 return;
43 43
44 profiles::FindOrCreateNewWindowForProfile( 44 profiles::FindOrCreateNewWindowForProfile(
45 profile, 45 profile,
46 chrome::startup::IS_PROCESS_STARTUP, 46 chrome::startup::IS_PROCESS_STARTUP,
47 chrome::startup::IS_FIRST_RUN, 47 chrome::startup::IS_FIRST_RUN,
48 desktop_type, 48 desktop_type,
49 false); 49 false);
50 } 50 }
51 51
52 void DeleteProfileAtPath(base::FilePath file_path, content::WebUI* web_ui) { 52 void DeleteProfileAtPath(base::FilePath file_path, content::WebUI* web_ui) {
53 DCHECK(web_ui); 53 DCHECK(web_ui);
54 54
55 if (!profiles::IsMultipleProfilesEnabled()) 55 if (!profiles::IsMultipleProfilesEnabled())
56 return; 56 return;
57 57
58 ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS); 58 ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS);
59 59
60 g_browser_process->profile_manager()->ScheduleProfileForDeletion( 60 g_browser_process->profile_manager()->ScheduleProfileForDeletion(
61 file_path, 61 file_path,
62 base::Bind(&OpenNewWindowForProfile, GetDesktopType(web_ui))); 62 base::Bind(&OpenNewWindowForProfile, GetDesktopType(web_ui)));
63 } 63 }
64 64
65 } // namespace helper 65 } // namespace helper
66 } // namespace options 66 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698