Skip to content

GitLab

T
tangled
Commit 73b7dd62 authored by treib's avatar treib Committed by Commit bot
Browse files
Options

Local NTP: Fade in the OneGoogleBar 

BUG=583292
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2852293002
Cr-Commit-Position: refs/heads/master@{#468633}
parent 6822b60b
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
chrome/browser/resources/local_ntp/local_ntp.css
View file @ 73b7dd62
......@@ -286,5 +286,10 @@ html[dir=rtl] #attribution,
#one-google {
position: fixed;
transition: opacity 130ms;
z-index: 1;
}
#one-google.hidden {
opacity: 0;
}
chrome/browser/resources/local_ntp/local_ntp.html
View file @ 73b7dd62
......@@ -9,13 +9,13 @@
<script src="chrome-search://local-ntp/config.js"
integrity="{{CONFIG_INTEGRITY}}"></script>
<script src="chrome-search://local-ntp/local-ntp.js"
integrity="sha256-ROPmcormZEipZzy3Ff+o345FFrhHWsAZjBpGIyZzCYY="></script>
integrity="sha256-yAvSu2Dl9rlQTpQn8P1hcE5GUFQVGbuCMHypwtN6uDg="></script>
<meta charset="utf-8">
<meta name="google" value="notranslate">
</head>
<body>
<!-- Container for the OneGoogleBar HTML. -->
<div id="one-google"></div>
<div id="one-google" class="hidden"></div>
<div id="ntp-contents">
<div id="logo" title="Google"></div>
......
chrome/browser/resources/local_ntp/local_ntp.js
View file @ 73b7dd62
......@@ -703,6 +703,7 @@ function injectOneGoogleBar(barHtml, endOfBodyHtml) {
inHeadScript.onload = function() {
var ogElem = $('one-google');
ogElem.innerHTML = barHtml;
ogElem.classList.remove('hidden');
var afterBarScript = document.createElement('script');
afterBarScript.src =
......
chrome/browser/search/local_ntp_source.cc
View file @ 73b7dd62
......@@ -422,7 +422,7 @@ std::string LocalNtpSource::GetContentSecurityPolicyScriptSrc() const {
GetIntegritySha256Value(
GetConfigData(default_search_provider_is_google_io_thread_)) +
"' "
"'sha256-ROPmcormZEipZzy3Ff+o345FFrhHWsAZjBpGIyZzCYY=';";
"'sha256-yAvSu2Dl9rlQTpQn8P1hcE5GUFQVGbuCMHypwtN6uDg=';";
}
std::string LocalNtpSource::GetContentSecurityPolicyChildSrc() const {
......
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