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

Unified Diff: chrome/browser/ui/webui/options/manage_profile_handler.cc

Issue 2121303003: Remove the "Settings" packaged app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/manage_profile_handler.cc
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index 387e7ce2582d6846f398f676fb30d0656d37a388..a1a2493c4e3b3358634baffb696105aa60e6aad2 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -47,11 +47,6 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/webui/web_ui_util.h"
-#if defined(ENABLE_SETTINGS_APP)
-#include "chrome/browser/ui/app_list/app_list_service.h"
-#include "content/public/browser/web_contents.h"
-#endif
-
namespace options {
namespace {
@@ -185,11 +180,6 @@ void ManageProfileHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback("profileIconSelectionChanged",
base::Bind(&ManageProfileHandler::ProfileIconSelectionChanged,
base::Unretained(this)));
-#if defined(ENABLE_SETTINGS_APP)
- web_ui()->RegisterMessageCallback("switchAppListProfile",
- base::Bind(&ManageProfileHandler::SwitchAppListProfile,
- base::Unretained(this)));
-#endif
web_ui()->RegisterMessageCallback("addProfileShortcut",
base::Bind(&ManageProfileHandler::AddProfileShortcut,
base::Unretained(this)));
@@ -413,26 +403,6 @@ void ManageProfileHandler::SetProfileIconAndName(const base::ListValue* args) {
profiles::UpdateProfileName(profile, new_profile_name);
}
-#if defined(ENABLE_SETTINGS_APP)
-void ManageProfileHandler::SwitchAppListProfile(const base::ListValue* args) {
- DCHECK(args);
- DCHECK(profiles::IsMultipleProfilesEnabled());
-
- const base::Value* file_path_value;
- base::FilePath profile_file_path;
- if (!args->Get(0, &file_path_value) ||
- !base::GetValueAsFilePath(*file_path_value, &profile_file_path))
- return;
-
- AppListService* app_list_service = AppListService::Get();
- app_list_service->SetProfilePath(profile_file_path);
- app_list_service->Show();
-
- // Close the settings app, since it will now be for the wrong profile.
- web_ui()->GetWebContents()->Close();
-}
-#endif // defined(ENABLE_SETTINGS_APP)
-
void ManageProfileHandler::ProfileIconSelectionChanged(
const base::ListValue* args) {
DCHECK(args);
« no previous file with comments | « chrome/browser/ui/webui/options/manage_profile_handler.h ('k') | chrome/browser/ui/webui/options/options_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698