Skip to content

GitLab

T
tangled
Commit df60d14a authored by Dan Beam (slow until 1/29)'s avatar Dan Beam (slow until 1/29) Committed by Commit Bot
Browse files
Options

Revert "WebUI Dark Mode: force user manager and print preview into light mode" 

This reverts commit 340e6008.

Reason for revert: this was just on the off chance WebUI Dark Mode made it in M73.  It's probably not going to, but either way: no longer need this temporary change in.

Original change's description:
> WebUI Dark Mode: force user manager and print preview into light mode
> 
> This is in the unlikely event that dark mode actually makes it in 73.
> These UIs are not ready yet.
> 
> R=​dpapad@chromium.org
> BUG=883049
> 
> Change-Id: Iaa79feadd8d341c4b730a9a6598f42c756070613
> Reviewed-on: https://chromium-review.googlesource.com/c/1435517
> Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
> Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
> Auto-Submit: Dan Beam (slow until 1/29) <dbeam@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#625843}

TBR=dbeam@chromium.org,dpapad@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 883049
Change-Id: I31278716430d53b1181de4da5044d158aaf33473
Reviewed-on: https://chromium-review.googlesource.com/c/1437746Reviewed-by: default avatarDan Beam (slow until 1/29) <dbeam@chromium.org>
Commit-Queue: Dan Beam (slow until 1/29) <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626305}
parent 42cd401e
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
chrome/browser/resources/md_user_manager/user_manager.html
View file @ df60d14a
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<html build="$i18n{buildType}" <html build="$i18n{buildType}"
dir="$i18n{textdirection}" dir="$i18n{textdirection}"
lang="$i18n{language}" lang="$i18n{language}"
screen="$i18n{screenType}"> screen="$i18n{screenType}"
$i18n{dark}>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="google" value="notranslate"> <meta name="google" value="notranslate">
...@@ -361,5 +362,6 @@ ...@@ -361,5 +362,6 @@
<include src="../../../../ui/login/account_picker/user_pod_template.html"> <include src="../../../../ui/login/account_picker/user_pod_template.html">
</user-manager-pages> </user-manager-pages>
<script src="user_manager.js"></script> <script src="user_manager.js"></script>
<link rel="import" href="chrome://resources/html/dark_mode.html">
</body> </body>
</html> </html>
chrome/browser/resources/print_preview/print_preview_new.html
View file @ df60d14a
<!doctype html> <!doctype html>
<html dir="$i18n{textdirection}" lang="$i18n{language}"> <html dir="$i18n{textdirection}" lang="$i18n{language}" $i18n{dark}>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<style> <style>
...@@ -22,5 +22,6 @@ ...@@ -22,5 +22,6 @@
<link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"> <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
<link rel="stylesheet" href="chrome://resources/css/md_colors.css"> <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
<link rel="import" href="new/app.html"> <link rel="import" href="new/app.html">
<link rel="import" href="chrome://resources/html/dark_mode.html">
</body> </body>
</html> </html>
chrome/browser/ui/webui/print_preview/print_preview_ui.cc
View file @ df60d14a
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "chrome/browser/printing/print_preview_data_service.h" #include "chrome/browser/printing/print_preview_data_service.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/webui/dark_mode_handler.h"
#include "chrome/browser/ui/webui/localized_string.h" #include "chrome/browser/ui/webui/localized_string.h"
#include "chrome/browser/ui/webui/metrics_handler.h" #include "chrome/browser/ui/webui/metrics_handler.h"
#include "chrome/browser/ui/webui/print_preview/print_preview_handler.h" #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h"
...@@ -468,6 +469,7 @@ PrintPreviewUI::PrintPreviewUI(content::WebUI* web_ui) ...@@ -468,6 +469,7 @@ PrintPreviewUI::PrintPreviewUI(content::WebUI* web_ui)
// Set up the chrome://print/ data source. // Set up the chrome://print/ data source.
Profile* profile = Profile::FromWebUI(web_ui); Profile* profile = Profile::FromWebUI(web_ui);
content::WebUIDataSource* source = CreatePrintPreviewUISource(profile); content::WebUIDataSource* source = CreatePrintPreviewUISource(profile);
DarkModeHandler::Initialize(web_ui, source);
content::WebUIDataSource::Add(profile, source); content::WebUIDataSource::Add(profile, source);
// Set up the chrome://theme/ source. // Set up the chrome://theme/ source.
......
chrome/browser/ui/webui/signin/md_user_manager_ui.cc
View file @ df60d14a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_shortcut_manager.h" #include "chrome/browser/profiles/profile_shortcut_manager.h"
#include "chrome/browser/signin/signin_util.h" #include "chrome/browser/signin/signin_util.h"
#include "chrome/browser/ui/webui/dark_mode_handler.h"
#include "chrome/browser/ui/webui/signin/signin_create_profile_handler.h" #include "chrome/browser/ui/webui/signin/signin_create_profile_handler.h"
#include "chrome/browser/ui/webui/signin/signin_utils.h" #include "chrome/browser/ui/webui/signin/signin_utils.h"
#include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h" #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
...@@ -44,6 +45,7 @@ MDUserManagerUI::MDUserManagerUI(content::WebUI* web_ui) ...@@ -44,6 +45,7 @@ MDUserManagerUI::MDUserManagerUI(content::WebUI* web_ui)
// Set up the chrome://md-user-manager/ source. // Set up the chrome://md-user-manager/ source.
auto* md_user_source = CreateUIDataSource(localized_strings); auto* md_user_source = CreateUIDataSource(localized_strings);
DarkModeHandler::Initialize(web_ui, md_user_source);
content::WebUIDataSource::Add(profile, md_user_source); content::WebUIDataSource::Add(profile, md_user_source);
// Set up the chrome://theme/ source // Set up the chrome://theme/ source
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment