Chromium Code Reviews| Index: chrome/browser/profiles/profile_window.cc |
| diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc |
| index 9ed0f49bb4aa0aa942a5305a1907ce8a0b20609a..4dfe963abfb4568348eb39540bee2d53cf41d334 100644 |
| --- a/chrome/browser/profiles/profile_window.cc |
| +++ b/chrome/browser/profiles/profile_window.cc |
| @@ -32,6 +32,7 @@ |
| #include "chrome/browser/ui/browser_dialogs.h" |
| #include "chrome/browser/ui/profile_chooser_constants.h" |
| #include "chrome/browser/ui/user_manager.h" |
| +#include "chrome/common/chrome_features.h" |
| #include "chrome/common/pref_names.h" |
| #include "chrome/common/url_constants.h" |
| #include "components/browser_sync/browser/profile_sync_service.h" |
| @@ -132,9 +133,15 @@ void OnUserManagerSystemProfileCreated( |
| if (status != Profile::CREATE_STATUS_INITIALIZED || callback.is_null()) |
| return; |
| + // Force Material Design user manager on when Material Design settings are on. |
| + bool useMaterialDesignUserManager = |
|
Dan Beam
2016/06/07 00:25:08
use_material_design_user_manager
this is not coco
groby-ooo-7-16
2016/06/09 00:18:24
Done.
|
| + switches::IsMaterialDesignUserManager() || |
| + base::FeatureList::IsEnabled(features::kMaterialDesignSettingsFeature); |
| + |
| // Tell the webui which user should be focused. |
| - std::string page = switches::IsMaterialDesignUserManager() ? |
| - chrome::kChromeUIMdUserManagerUrl : chrome::kChromeUIUserManagerURL; |
| + std::string page = useMaterialDesignUserManager |
| + ? chrome::kChromeUIMdUserManagerUrl |
| + : chrome::kChromeUIUserManagerURL; |
| if (tutorial_mode == profiles::USER_MANAGER_TUTORIAL_OVERVIEW) { |
| page += profiles::kUserManagerDisplayTutorial; |