| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/webui/options/manage_profile_handler.h" | 5 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "chrome/browser/ui/browser_finder.h" | 22 #include "chrome/browser/ui/browser_finder.h" |
| 23 #include "chrome/common/chrome_notification_types.h" | 23 #include "chrome/common/chrome_notification_types.h" |
| 24 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
| 25 #include "content/public/browser/browser_thread.h" | 25 #include "content/public/browser/browser_thread.h" |
| 26 #include "content/public/browser/notification_service.h" | 26 #include "content/public/browser/notification_service.h" |
| 27 #include "content/public/browser/web_ui.h" | 27 #include "content/public/browser/web_ui.h" |
| 28 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
| 29 #include "ui/webui/web_ui_util.h" | 29 #include "ui/webui/web_ui_util.h" |
| 30 | 30 |
| 31 #if defined(ENABLE_SETTINGS_APP) | 31 #if defined(ENABLE_SETTINGS_APP) |
| 32 #include "chrome/browser/ui/app_list/app_list_util.h" | 32 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 33 #include "content/public/browser/web_contents.h" | 33 #include "content/public/browser/web_contents.h" |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 namespace options { | 36 namespace options { |
| 37 | 37 |
| 38 namespace { | 38 namespace { |
| 39 | 39 |
| 40 const char kCreateProfileIconGridName[] = "create-profile-icon-grid"; | 40 const char kCreateProfileIconGridName[] = "create-profile-icon-grid"; |
| 41 const char kManageProfileIconGridName[] = "manage-profile-icon-grid"; | 41 const char kManageProfileIconGridName[] = "manage-profile-icon-grid"; |
| 42 | 42 |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 void ManageProfileHandler::SwitchAppListProfile(const ListValue* args) { | 311 void ManageProfileHandler::SwitchAppListProfile(const ListValue* args) { |
| 312 DCHECK(args); | 312 DCHECK(args); |
| 313 DCHECK(ProfileManager::IsMultipleProfilesEnabled()); | 313 DCHECK(ProfileManager::IsMultipleProfilesEnabled()); |
| 314 | 314 |
| 315 const Value* file_path_value; | 315 const Value* file_path_value; |
| 316 base::FilePath profile_file_path; | 316 base::FilePath profile_file_path; |
| 317 if (!args->Get(0, &file_path_value) || | 317 if (!args->Get(0, &file_path_value) || |
| 318 !base::GetValueAsFilePath(*file_path_value, &profile_file_path)) | 318 !base::GetValueAsFilePath(*file_path_value, &profile_file_path)) |
| 319 return; | 319 return; |
| 320 | 320 |
| 321 chrome::SetAppListProfile(profile_file_path); | 321 AppListService::Get()->SetAppListProfile(profile_file_path); |
| 322 // Close the settings app, since it will now be for the wrong profile. | 322 // Close the settings app, since it will now be for the wrong profile. |
| 323 web_ui()->GetWebContents()->Close(); | 323 web_ui()->GetWebContents()->Close(); |
| 324 } | 324 } |
| 325 #endif // defined(ENABLE_SETTINGS_APP) | 325 #endif // defined(ENABLE_SETTINGS_APP) |
| 326 | 326 |
| 327 void ManageProfileHandler::ProfileIconSelectionChanged( | 327 void ManageProfileHandler::ProfileIconSelectionChanged( |
| 328 const base::ListValue* args) { | 328 const base::ListValue* args) { |
| 329 DCHECK(args); | 329 DCHECK(args); |
| 330 | 330 |
| 331 base::FilePath profile_file_path; | 331 base::FilePath profile_file_path; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 g_browser_process->profile_manager()->profile_shortcut_manager(); | 416 g_browser_process->profile_manager()->profile_shortcut_manager(); |
| 417 DCHECK(shortcut_manager); | 417 DCHECK(shortcut_manager); |
| 418 | 418 |
| 419 shortcut_manager->RemoveProfileShortcuts(profile_file_path); | 419 shortcut_manager->RemoveProfileShortcuts(profile_file_path); |
| 420 | 420 |
| 421 // Update the UI buttons. | 421 // Update the UI buttons. |
| 422 OnHasProfileShortcuts(false); | 422 OnHasProfileShortcuts(false); |
| 423 } | 423 } |
| 424 | 424 |
| 425 } // namespace options | 425 } // namespace options |
| OLD | NEW |