Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/md_history/app.vulcanized.html

Issue 2684493002: MD History: Delete Grouped History (Closed)
Patch Set: Vulc Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/compiled_resources2.gyp » ('j') | chrome/browser/resources/md_history/query_manager.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/md_history/app.vulcanized.html
diff --git a/chrome/browser/resources/md_history/app.vulcanized.html b/chrome/browser/resources/md_history/app.vulcanized.html
index fa4b5f57b4b0a7e73c6189f52dc48a89da8cedcb..1842b6ba524b919ed9d11bacbb6b3cc54eaac6bc 100644
--- a/chrome/browser/resources/md_history/app.vulcanized.html
+++ b/chrome/browser/resources/md_history/app.vulcanized.html
@@ -200,7 +200,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<g id="clear"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></g>
<g id="close"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></g>
<g id="delete"><path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"></path></g>
- <g id="domain"><path d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z"></path></g>
+ <g id="domain" shape-rendering="crispEdges" viewBox="-0.75 -0.75 25.5 25.5"><path d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z"></path></g>
<g id="expand-less"><path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"></path></g>
<g id="expand-more"><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></g>
<g id="extension"><path d="M20.5 11H19V7c0-1.1-.9-2-2-2h-4V3.5C13 2.12 11.88 1 10.5 1S8 2.12 8 3.5V5H4c-1.1 0-1.99.9-1.99 2v3.8H3.5c1.49 0 2.7 1.21 2.7 2.7s-1.21 2.7-2.7 2.7H2V20c0 1.1.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7 1.49 0 2.7 1.21 2.7 2.7V22H17c1.1 0 2-.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20.5 11z"></path></g>
@@ -208,7 +208,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<g id="folder"><path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"></path></g>
<g id="fullscreen"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"></path></g>
<g id="group"><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"></path></g>
- <g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path></g>
+ <g id="menu" shape-rendering="crispEdges" viewBox="0.375 0.375 23.38 23.38"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path></g>
<g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"></path></g>
<g id="open-in-new"><path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></g>
<g id="person"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></g>
@@ -2083,7 +2083,6 @@ h1 {
--side-bar-width: 256px;
--sidebar-footer-text-color: #6e6e6e;
--sidebar-unselected-color: #5a5a5a;
- --toolbar-grouped-height: 101px;
--toolbar-height: 56px;
}
@@ -2334,78 +2333,6 @@ paper-button {
-webkit-margin-start: 2px;
}
-paper-tabs {
- --paper-tabs_-_font-size: apply-shim-inherit;;
- --paper-tabs-selection-bar-color: #fff;
- height: calc(var(--toolbar-grouped-height) - var(--toolbar-height));
- min-width: 300px;
-}
-
-paper-tab {
- --paper-tab-ink: rgba(255, 255, 255, 0.4);
- text-transform: uppercase;
-}
-
-#grouped-buttons-container {
- margin: var(--card-sizing_-_margin); max-width: var(--card-sizing_-_max-width); min-width: var(--card-sizing_-_min-width); padding: var(--card-sizing_-_padding); width: var(--card-sizing_-_width);
- align-items: center;
- display: flex;
- max-height: 0;
- opacity: 0;
- transition: opacity 300ms, max-height 300ms;
-}
-
-:host([show-grouped-controls]) #grouped-buttons-container {
- max-height: calc(var(--toolbar-grouped-height) - var(--toolbar-height));
- opacity: 1;
-}
-
-#grouped-spacer {
- -webkit-margin-start: var(--side-bar-width);
-}
-
-:host([has-drawer]) #grouped-spacer {
- -webkit-margin-start: 0;
-}
-
-#grouped-nav-container {
- -webkit-margin-end: 16px;
- align-items: center;
- display: flex;
- flex: 1;
- justify-content: flex-end;
- overflow: hidden;
- transition: opacity 150ms;
-}
-
-:host([grouped-range='0']) #grouped-nav-container {
- opacity: 0;
- pointer-events: none;
-}
-
-#grouped-date {
- -webkit-margin-end: 8px;
- flex: 0 1 auto;
- opacity: 0.7;
- overflow: hidden;
- text-align: right;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-#grouped-nav-container button {
- -webkit-margin-start: 8px;
- flex: 0 0 auto;
-}
-
-#grouped-nav-container button[disabled] {
- color: rgba(255, 255, 255, 0.5);
-}
-
-:host-context([dir=rtl]) .rtl-reversible {
- transform: rotate(180deg);
-}
-
</style>
<div id="toolbar-container">
<cr-toolbar id="main-toolbar" page-name="$i18n{title}" clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt}" hidden$="[[itemsSelected_]]" spinner-active="[[spinnerActive]]" show-menu="[[hasDrawer]]" show-menu-promo="[[showMenuPromo]]" menu-label="$i18n{historyMenuButton}" menu-promo="$i18n{menuPromo}" close-menu-promo="$i18n{closeMenuPromo}" on-search-changed="onSearchChanged_">
@@ -2438,31 +2365,6 @@ paper-tab {
</div>
</template>
</div>
- <template is="dom-if" if="[[isGroupedMode]]">
- <div id="grouped-spacer">
- <div id="grouped-buttons-container">
- <paper-tabs attr-for-selected="value" selected="[[groupedRange]]" on-iron-select="onTabSelected_">
- <paper-tab value="0">$i18n{rangeAllTime}</paper-tab>
- <paper-tab value="1">$i18n{rangeWeek}</paper-tab>
- <paper-tab value="2">$i18n{rangeMonth}</paper-tab>
- </paper-tabs>
- <div id="grouped-nav-container">
- <span id="grouped-date">
- [[getHistoryInterval_(queryInfo)]]
- </span>
- <button is="paper-icon-button-light" id="today-button" class="icon-button" title="$i18n{rangeToday}" on-click="onTodayTap_" disabled="[[isToday_(groupedOffset)]]">
- <iron-icon icon="history:today"></iron-icon>
- </button>
- <button is="paper-icon-button-light" id="prev-button" title="$i18n{rangePrevious}" class="icon-button rtl-reversible" on-click="onPrevTap_" disabled="[[!hasMoreResults]]">
- <iron-icon icon="history:chevron-left"></iron-icon>
- </button>
- <button is="paper-icon-button-light" id="next-button" title="$i18n{rangeNext}" class="icon-button rtl-reversible" on-click="onNextTap_" disabled="[[isToday_(groupedOffset)]]">
- <iron-icon icon="cr:chevron-right"></iron-icon>
- </button>
- </div>
- </div>
- </div>
- </template>
</template>
</dom-module>
@@ -2791,7 +2693,7 @@ button {
padding: 0;
}
-:host(:not([embedded])) #main-container {
+#main-container {
position: relative;
}
@@ -2944,10 +2846,6 @@ button {
top: 0;
}
-:host([embedded]) #background {
- display: none;
-}
-
:host(:not([is-card-start])) #background {
top: -5px;
}
@@ -3290,7 +3188,7 @@ paper-icon-button.subpage-arrow {
overflow: hidden;
}
-#content, #content > * {
+history-list {
height: 100%;
}
@@ -3299,14 +3197,8 @@ dialog .body {
}
</style>
- <iron-pages id="content" attr-for-selected="id" selected="[[selectedPage_]]">
- <history-list id="infinite-list" querying="[[queryState.querying]]" searched-term="[[queryResult.info.term]]">
- </history-list>
- <template is="dom-if" if="[[grouped]]">
- <history-grouped-list id="grouped-list" range="[[queryState.range]]" query-interval="[[queryResult.info.queryInterval]]" searched-term="[[queryResult.info.term]]">
- </history-grouped-list>
- </template>
- </iron-pages>
+ <history-list id="infinite-list" querying="[[queryState.querying]]" searched-term="[[queryResult.info.term]]">
+ </history-list>
<template is="cr-lazy-render" id="dialog">
<dialog is="cr-dialog">
@@ -3704,10 +3596,6 @@ history-toolbar {
position: relative;
}
-:host([grouped_]) #main-container {
- height: calc(100% - var(--toolbar-grouped-height));
-}
-
#content-side-bar {
float: left;
}
@@ -3739,9 +3627,9 @@ history-toolbar {
</style>
<history-query-manager query-state="{{queryState_}}" query-result="[[queryResult_]]" router="[[$$('#router')]]">
</history-query-manager>
- <history-router id="router" selected-page="{{selectedPage_}}" grouped="[[grouped_]]" query-state="[[queryState_]]">
+ <history-router id="router" selected-page="{{selectedPage_}}" query-state="[[queryState_]]">
</history-router>
- <history-toolbar id="toolbar" grouped-offset="[[queryState_.groupedOffset]]" grouped-range="[[queryState_.range]]" has-drawer="[[hasDrawer_]]" has-more-results="[[!queryResult_.info.finished]]" is-grouped-mode="[[grouped_]]" query-info="[[queryResult_.info]]" querying="[[queryState_.querying]]" search-term="[[queryState_.searchTerm]]" show-grouped-controls="[[!syncedTabsSelected_(selectedPage_)]]" show-menu-promo="[[showMenuPromo_]]" show-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]" spinner-active="[[shouldShowSpinner_(queryState_.querying,
+ <history-toolbar id="toolbar" has-drawer="[[hasDrawer_]]" has-more-results="[[!queryResult_.info.finished]]" query-info="[[queryResult_.info]]" querying="[[queryState_.querying]]" search-term="[[queryState_.searchTerm]]" show-menu-promo="[[showMenuPromo_]]" show-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]" spinner-active="[[shouldShowSpinner_(queryState_.querying,
queryState_.incremental,
queryState_.searchTerm)]]">
</history-toolbar>
@@ -3750,7 +3638,7 @@ history-toolbar {
<history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" hidden$="[[hasDrawer_]]">
</history-side-bar>
<iron-pages id="content" attr-for-selected="path" fallback-selection="history" selected="[[getSelectedPage_(selectedPage_, items)]]" items="{{items}}">
- <history-list-container id="history" query-state="[[queryState_]]" query-result="[[queryResult_]]" grouped="[[grouped_]]" path="history">
+ <history-list-container id="history" query-state="[[queryState_]]" query-result="[[queryResult_]]" path="history">
</history-list-container>
<template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
<history-synced-device-manager id="synced-devices" session-list="[[queryResult_.sessionList]]" search-term="[[queryState_.searchTerm]]" sign-in-state="[[isUserSignedIn_]]" path="syncedTabs">
« no previous file with comments | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/compiled_resources2.gyp » ('j') | chrome/browser/resources/md_history/query_manager.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698