Chromium Code Reviews| Index: chrome/browser/resources/md_history/app.crisper.js |
| diff --git a/chrome/browser/resources/md_history/app.crisper.js b/chrome/browser/resources/md_history/app.crisper.js |
| index cd1578e6fa0b42f9a8c00ecc3328832a58d987fe..afdfb404e99462dd4a07bb32fe74303cf918b24d 100644 |
| --- a/chrome/browser/resources/md_history/app.crisper.js |
| +++ b/chrome/browser/resources/md_history/app.crisper.js |
| @@ -6056,11 +6056,17 @@ Polymer({ |
| searchPrompt: String, |
| clearLabel: String, |
| menuLabel: String, |
| + menuPromo: String, |
| spinnerActive: Boolean, |
| showMenu: { |
| type: Boolean, |
| value: false |
| }, |
| + showMenuPromo: { |
| + type: Boolean, |
| + value: false |
| + }, |
| + closeMenuPromo: String, |
| narrow_: { |
| type: Boolean, |
| reflectToAttribute: true |
| @@ -6070,14 +6076,109 @@ Polymer({ |
| reflectToAttribute: true |
| } |
| }, |
| + observers: [ 'possiblyShowMenuPromo_(showMenu, showMenuPromo, showingSearch_)' ], |
|
Pam (message me for reviews)
2016/09/21 04:44:12
ditto
|
| getSearchField: function() { |
| return this.$.search; |
| }, |
| - onMenuTap_: function(e) { |
| + onClosePromoTap_: function() { |
| + this.showMenuPromo = false; |
| + }, |
| + onMenuTap_: function() { |
| this.fire('cr-menu-tap'); |
| + this.onClosePromoTap_(); |
| + }, |
| + possiblyShowMenuPromo_: function() { |
| + Polymer.RenderStatus.afterNextRender(this, function() { |
| + if (this.showMenu && this.showMenuPromo && !this.showingSearch_) { |
| + this.$$('#menuPromo').animate({ |
| + opacity: [ 0, .9 ] |
| + }, { |
| + duration: 500, |
| + fill: 'forwards' |
| + }); |
| + this.fire('cr-menu-promo-shown'); |
| + } |
| + }.bind(this)); |
| + }, |
| + titleIfNotShowMenuPromo_: function(title, showMenuPromo) { |
| + return showMenuPromo ? '' : title; |
| } |
| }); |
| +// Copyright 2016 The Chromium Authors. All rights reserved. |
| +// Use of this source code is governed by a BSD-style license that can be |
| +// found in the LICENSE file. |
| +cr.define('md_history', function() { |
| + function BrowserService() { |
| + this.pendingDeleteItems_ = null; |
| + this.pendingDeletePromise_ = null; |
| + } |
| + BrowserService.prototype = { |
| + deleteItems: function(items) { |
| + if (this.pendingDeleteItems_ != null) { |
| + return new Promise(function(resolve, reject) { |
| + reject(items); |
| + }); |
| + } |
| + var removalList = items.map(function(item) { |
| + return { |
| + url: item.url, |
| + timestamps: item.allTimestamps |
| + }; |
| + }); |
| + this.pendingDeleteItems_ = items; |
| + this.pendingDeletePromise_ = new PromiseResolver(); |
| + chrome.send('removeVisits', removalList); |
| + return this.pendingDeletePromise_.promise; |
| + }, |
| + removeBookmark: function(url) { |
| + chrome.send('removeBookmark', [ url ]); |
| + }, |
| + openForeignSessionAllTabs: function(sessionTag) { |
| + chrome.send('openForeignSession', [ sessionTag ]); |
| + }, |
| + openForeignSessionTab: function(sessionTag, windowId, tabId, e) { |
| + chrome.send('openForeignSession', [ sessionTag, String(windowId), String(tabId), e.button || 0, e.altKey, e.ctrlKey, e.metaKey, e.shiftKey ]); |
| + }, |
| + deleteForeignSession: function(sessionTag) { |
| + chrome.send('deleteForeignSession', [ sessionTag ]); |
| + }, |
| + openClearBrowsingData: function() { |
| + chrome.send('clearBrowsingData'); |
| + }, |
| + recordHistogram: function(histogram, value, max) { |
| + chrome.send('metricsHandler:recordInHistogram', [ histogram, value, max ]); |
| + }, |
| + recordAction: function(action) { |
| + if (action.indexOf('_') == -1) action = 'HistoryPage_' + action; |
| + chrome.send('metricsHandler:recordAction', [ action ]); |
| + }, |
| + resolveDelete_: function(successful) { |
| + if (this.pendingDeleteItems_ == null || this.pendingDeletePromise_ == null) { |
| + return; |
| + } |
| + if (successful) this.pendingDeletePromise_.resolve(this.pendingDeleteItems_); else this.pendingDeletePromise_.reject(this.pendingDeleteItems_); |
| + this.pendingDeleteItems_ = null; |
| + this.pendingDeletePromise_ = null; |
| + }, |
| + menuPromoShown: function() { |
| + chrome.send('menuPromoShown'); |
| + } |
| + }; |
| + cr.addSingletonGetter(BrowserService); |
| + return { |
| + BrowserService: BrowserService |
| + }; |
| +}); |
| + |
| +function deleteComplete() { |
| + md_history.BrowserService.getInstance().resolveDelete_(true); |
| +} |
| + |
| +function deleteFailed() { |
| + md_history.BrowserService.getInstance().resolveDelete_(false); |
| +} |
| + |
| // Copyright 2015 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| @@ -6119,7 +6220,13 @@ Polymer({ |
| notify: true |
| }, |
| queryStartTime: String, |
| - queryEndTime: String |
| + queryEndTime: String, |
| + showMenuPromo_: { |
| + type: Boolean, |
| + value: function() { |
| + return loadTimeData.getBoolean('showMenuPromo'); |
| + } |
| + } |
| }, |
| changeToolbarView_: function() { |
| this.itemsSelected_ = this.count > 0; |
| @@ -6131,6 +6238,9 @@ Polymer({ |
| searchField.showAndFocus(); |
| searchField.setValue(search); |
| }, |
| + onMenuPromoShown_: function() { |
| + md_history.BrowserService.getInstance().menuPromoShown(); |
| + }, |
| onSearchChanged_: function(event) { |
| this.searchTerm = event.detail; |
| }, |
| @@ -6417,77 +6527,6 @@ Polymer({ |
| behaviors: [ Polymer.PaperItemBehavior ] |
| }); |
| -// Copyright 2016 The Chromium Authors. All rights reserved. |
| -// Use of this source code is governed by a BSD-style license that can be |
| -// found in the LICENSE file. |
| -cr.define('md_history', function() { |
| - function BrowserService() { |
| - this.pendingDeleteItems_ = null; |
| - this.pendingDeletePromise_ = null; |
| - } |
| - BrowserService.prototype = { |
| - deleteItems: function(items) { |
| - if (this.pendingDeleteItems_ != null) { |
| - return new Promise(function(resolve, reject) { |
| - reject(items); |
| - }); |
| - } |
| - var removalList = items.map(function(item) { |
| - return { |
| - url: item.url, |
| - timestamps: item.allTimestamps |
| - }; |
| - }); |
| - this.pendingDeleteItems_ = items; |
| - this.pendingDeletePromise_ = new PromiseResolver(); |
| - chrome.send('removeVisits', removalList); |
| - return this.pendingDeletePromise_.promise; |
| - }, |
| - removeBookmark: function(url) { |
| - chrome.send('removeBookmark', [ url ]); |
| - }, |
| - openForeignSessionAllTabs: function(sessionTag) { |
| - chrome.send('openForeignSession', [ sessionTag ]); |
| - }, |
| - openForeignSessionTab: function(sessionTag, windowId, tabId, e) { |
| - chrome.send('openForeignSession', [ sessionTag, String(windowId), String(tabId), e.button || 0, e.altKey, e.ctrlKey, e.metaKey, e.shiftKey ]); |
| - }, |
| - deleteForeignSession: function(sessionTag) { |
| - chrome.send('deleteForeignSession', [ sessionTag ]); |
| - }, |
| - openClearBrowsingData: function() { |
| - chrome.send('clearBrowsingData'); |
| - }, |
| - recordHistogram: function(histogram, value, max) { |
| - chrome.send('metricsHandler:recordInHistogram', [ histogram, value, max ]); |
| - }, |
| - recordAction: function(action) { |
| - if (action.indexOf('_') == -1) action = 'HistoryPage_' + action; |
| - chrome.send('metricsHandler:recordAction', [ action ]); |
| - }, |
| - resolveDelete_: function(successful) { |
| - if (this.pendingDeleteItems_ == null || this.pendingDeletePromise_ == null) { |
| - return; |
| - } |
| - if (successful) this.pendingDeletePromise_.resolve(this.pendingDeleteItems_); else this.pendingDeletePromise_.reject(this.pendingDeleteItems_); |
| - this.pendingDeleteItems_ = null; |
| - this.pendingDeletePromise_ = null; |
| - } |
| - }; |
| - cr.addSingletonGetter(BrowserService); |
| - return { |
| - BrowserService: BrowserService |
| - }; |
| -}); |
| - |
| -function deleteComplete() { |
| - md_history.BrowserService.getInstance().resolveDelete_(true); |
| -} |
| - |
| -function deleteFailed() { |
| - md_history.BrowserService.getInstance().resolveDelete_(false); |
| -} |
| - |
| Polymer({ |
| is: 'iron-collapse', |
| behaviors: [ Polymer.IronResizableBehavior ], |