| 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 "chrome/browser/ui/app_list/app_list_controller_delegate_impl.h" | 5 #include "chrome/browser/ui/app_list/app_list_controller_delegate_impl.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/profiles/profile_manager.h" | 8 #include "chrome/browser/profiles/profile_manager.h" |
| 9 #include "chrome/browser/ui/app_list/app_list_service_impl.h" | 9 #include "chrome/browser/ui/app_list/app_list_service_impl.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 chrome::ShowCreateChromeAppShortcutsDialog( | 77 chrome::ShowCreateChromeAppShortcutsDialog( |
| 78 parent_window, profile, extension, | 78 parent_window, profile, extension, |
| 79 base::Bind(&AppListControllerDelegateImpl::OnCloseCreateShortcutsPrompt, | 79 base::Bind(&AppListControllerDelegateImpl::OnCloseCreateShortcutsPrompt, |
| 80 base::Unretained(this))); | 80 base::Unretained(this))); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void AppListControllerDelegateImpl::CreateNewWindow(Profile* profile, | 83 void AppListControllerDelegateImpl::CreateNewWindow(Profile* profile, |
| 84 bool incognito) { | 84 bool incognito) { |
| 85 Profile* window_profile = incognito ? | 85 Profile* window_profile = incognito ? |
| 86 profile->GetOffTheRecordProfile() : profile; | 86 profile->GetOffTheRecordProfile() : profile; |
| 87 chrome::NewEmptyWindow(window_profile, chrome::HOST_DESKTOP_TYPE_NATIVE); | 87 chrome::NewEmptyWindow(window_profile); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void AppListControllerDelegateImpl::OpenURL(Profile* profile, | 90 void AppListControllerDelegateImpl::OpenURL(Profile* profile, |
| 91 const GURL& url, | 91 const GURL& url, |
| 92 ui::PageTransition transition, | 92 ui::PageTransition transition, |
| 93 WindowOpenDisposition disposition) { | 93 WindowOpenDisposition disposition) { |
| 94 chrome::NavigateParams params(profile, url, transition); | 94 chrome::NavigateParams params(profile, url, transition); |
| 95 params.disposition = disposition; | 95 params.disposition = disposition; |
| 96 chrome::Navigate(¶ms); | 96 chrome::Navigate(¶ms); |
| 97 } | 97 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 bool AppListControllerDelegateImpl::ShouldShowUserIcon() { | 137 bool AppListControllerDelegateImpl::ShouldShowUserIcon() { |
| 138 return g_browser_process->profile_manager()->GetNumberOfProfiles() > 1; | 138 return g_browser_process->profile_manager()->GetNumberOfProfiles() > 1; |
| 139 } | 139 } |
| 140 | 140 |
| 141 void AppListControllerDelegateImpl::FillLaunchParams(AppLaunchParams* params) {} | 141 void AppListControllerDelegateImpl::FillLaunchParams(AppLaunchParams* params) {} |
| 142 | 142 |
| 143 void AppListControllerDelegateImpl::OnCloseCreateShortcutsPrompt( | 143 void AppListControllerDelegateImpl::OnCloseCreateShortcutsPrompt( |
| 144 bool created) { | 144 bool created) { |
| 145 OnCloseChildDialog(); | 145 OnCloseChildDialog(); |
| 146 } | 146 } |
| OLD | NEW |