diff options
Diffstat (limited to 'chrome')
6 files changed, 2 insertions, 37 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index d14d406..899a60f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -13445,12 +13445,6 @@ After you create a new supervised user, you can manage their settings at any tim </if> <!-- User manager tutorial --> - <message name="IDS_USER_MANAGER_TUTORIAL_START" desc="Text of the button that continues the tutorial"> - See what's new - </message> - <message name="IDS_USER_MANAGER_TUTORIAL_SKIP" desc="Text of the button that stops the tutorial"> - Skip - </message> <message name="IDS_USER_MANAGER_TUTORIAL_NEXT" desc="Text of the button that advances the tutorial to the next slide"> Next </message> diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 2cc150c..06efa4e 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -361,7 +361,6 @@ </if> <if expr="not is_android and not is_ios and not chromeos"> <!-- User Manager tutorial --> - <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_WELCOME" file="common/user_manager_tutorial/welcome.png" /> <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_YOUR_CHROME" file="common/user_manager_tutorial/your_chrome.png" /> <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_GUESTS" file="common/user_manager_tutorial/guests.png" /> <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_FRIENDS" file="common/user_manager_tutorial/family_and_friends.png" /> diff --git a/chrome/browser/resources/user_manager/user_manager_tutorial.css b/chrome/browser/resources/user_manager/user_manager_tutorial.css index 642ac92..7337153 100644 --- a/chrome/browser/resources/user_manager/user_manager_tutorial.css +++ b/chrome/browser/resources/user_manager/user_manager_tutorial.css @@ -148,13 +148,6 @@ html[dir=rtl] #slide-guests .arrow-down { height: 182px; } -#slide-welcome .slide-image { - background-color: white; - background-image: url( - 'chrome://theme/IDR_ICON_USER_MANAGER_TUTORIAL_WELCOME'); - height: 156px; -} - #slide-your-chrome .slide-image { background-color: rgb(241, 202, 58); background-image: url( diff --git a/chrome/browser/resources/user_manager/user_manager_tutorial.html b/chrome/browser/resources/user_manager/user_manager_tutorial.html index fc5432b..5fb93a0 100644 --- a/chrome/browser/resources/user_manager/user_manager_tutorial.html +++ b/chrome/browser/resources/user_manager/user_manager_tutorial.html @@ -1,20 +1,5 @@ <div id="user-manager-tutorial" hidden> - <div class="tutorial-slide" id="slide-welcome"> - <div class="slide-image"></div> - <div class="slide-contents"> - <div class="slide-title" i18n-content="slideWelcomeTitle"></div> - <div class="slide-text" i18n-content="slideWelcomeText"></div> - </div> - <div class="slide-buttons"> - <button id="slide-welcome-next" - class="left custom-appearance button-fancy button-blue" - i18n-content="tutorialStart"></button> - <button id="slide-welcome-skip" class="right" - i18n-content="tutorialSkip"></button> - </div> - </div> - - <div class="tutorial-slide hidden" id="slide-your-chrome"> + <div class="tutorial-slide" id="slide-your-chrome"> <div class="slide-image"></div> <div class="slide-contents"> <div class="slide-title" i18n-content="slideYourChromeTitle"></div> diff --git a/chrome/browser/resources/user_manager/user_manager_tutorial.js b/chrome/browser/resources/user_manager/user_manager_tutorial.js index 41ae9d1..b0a46c7 100644 --- a/chrome/browser/resources/user_manager/user_manager_tutorial.js +++ b/chrome/browser/resources/user_manager/user_manager_tutorial.js @@ -17,8 +17,7 @@ cr.define('cr.ui.login', function() { /** * Tutorial slides. */ - slides_: ['slide-welcome', - 'slide-your-chrome', + slides_: ['slide-your-chrome', 'slide-friends', 'slide-guests', 'slide-complete', @@ -115,7 +114,6 @@ cr.define('cr.ui.login', function() { // Otherwise, center the slides and disable interacting with the pods // while the tutorial is showing. if ($('pod-row').pods.length == 1) { - $('slide-welcome').classList.add('single-pod'); $('slide-your-chrome').classList.add('single-pod'); $('slide-complete').classList.add('single-pod'); } diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc index 10b6970..f76e9a4 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc @@ -523,10 +523,6 @@ void UserManagerScreenHandler::GetLocalizedValues( base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL))); // Strings needed for the User Manager tutorial slides. - localized_strings->SetString("tutorialStart", - l10n_util::GetStringUTF16(IDS_USER_MANAGER_TUTORIAL_START)); - localized_strings->SetString("tutorialSkip", - l10n_util::GetStringUTF16(IDS_USER_MANAGER_TUTORIAL_SKIP)); localized_strings->SetString("tutorialNext", l10n_util::GetStringUTF16(IDS_USER_MANAGER_TUTORIAL_NEXT)); localized_strings->SetString("tutorialDone", |