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

Unified Diff: chrome/browser/resources/pdf/index-material.html

Issue 806633003: Implement basic toolbar with Material Design and loading progress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tidying Created 5 years, 11 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/pdf/index-material.css ('k') | chrome/browser/resources/pdf/pdf.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/pdf/index-material.html
diff --git a/chrome/browser/resources/pdf/index-material.html b/chrome/browser/resources/pdf/index-material.html
index 6d0b43abc7afdd4b3c126136da4c08ee0d269af4..28c1e00c0f00c0597159235fe0cbd5476e1dbad8 100644
--- a/chrome/browser/resources/pdf/index-material.html
+++ b/chrome/browser/resources/pdf/index-material.html
@@ -7,17 +7,40 @@
<link rel="import" href="html_office/elements/viewer-error-screen/viewer-error-screen.html">
<link rel="import" href="html_office/elements/viewer-page-indicator/viewer-page-indicator.html">
<link rel="import" href="html_office/elements/viewer-password-screen/viewer-password-screen.html">
- <link rel="import" href="html_office/elements/viewer-progress-bar/viewer-progress-bar.html">
<link rel="import" href="html_office/elements/viewer-toolbar/viewer-toolbar.html">
+
+ <link rel="import" href="chrome://resources/polymer/core-toolbar/core-toolbar.html">
+ <link rel="import" href="chrome://resources/polymer/paper-icon-button/paper-icon-button.html">
+ <link rel="import" href="chrome://resources/polymer/paper-progress/paper-progress.html">
+ <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.html">
+
+ <!-- TODO(alexandrec): When https://codereview.chromium.org/846833002/ is landed, remove this.-->
Sam McNally 2015/01/19 00:09:36 I think you can remove this now.
Alexandre Carlton 2015/01/19 00:40:12 Done.
+ <link href="http://fonts.googleapis.com/css?family=RobotoDraft:regular,bold,italic,thin,light,bolditalic,black,medium&lang=en" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" type="text/css" href="index.css">
+ <link rel="stylesheet" type="text/css" href="index-material.css">
</head>
<body>
+<paper-shadow id="toolbar-shadow" z="1">
+ <paper-progress value="0" id="progress-bar"></paper-progress>
+ <core-toolbar id="pdf-toolbar">
+ <span id="left-toolbar" flex>
Sam McNally 2015/01/19 00:09:36 Is this containing span necessary?
Alexandre Carlton 2015/01/19 00:40:12 Removed.
+ <span id="title">PDF Viewer</span>
Sam McNally 2015/01/19 00:09:36 Is "PDF Viewer" meant to be seen? If not, leave th
raymes 2015/01/19 00:11:49 +1
Alexandre Carlton 2015/01/19 00:40:12 Done.
+ </span>
+
+ <span id="middle-toolbar" flex>
Sam McNally 2015/01/19 00:09:36 Does this need an id?
Alexandre Carlton 2015/01/19 00:40:12 Removed.
+ </span>
+
+ <span id="left-toolbar">
Sam McNally 2015/01/19 00:09:36 Is this containing span necessary?
Alexandre Carlton 2015/01/19 00:40:12 Removed.
+ <paper-icon-button icon="file-download" id="save-button"></paper-icon-button>
+ <paper-icon-button icon="print" id="print-button"></paper-icon-button>
+ </span>
+ </core-toolbar>
+</paper-shadow>
<div id="sizer"></div>
<viewer-password-screen id="password-screen"></viewer-password-screen>
<viewer-page-indicator id="page-indicator"></viewer-page-indicator>
-<viewer-progress-bar id="progress-bar"></viewer-progress-bar>
<viewer-toolbar id="toolbar">
<viewer-button id="fit-to-page-button"
@@ -36,14 +59,6 @@
assetpath="html_office/elements/viewer-button/"
img="button_zoom_in.png">
</viewer-button>
- <viewer-button id="save-button"
- assetpath="html_office/elements/viewer-button/"
- img="button_save.png">
- </viewer-button>
- <viewer-button id="print-button"
- assetpath="html_office/elements/viewer-button/"
- img="button_print.png">
- </viewer-button>
</viewer-toolbar>
<viewer-error-screen id="error-screen"></viewer-error-screen>
« no previous file with comments | « chrome/browser/resources/pdf/index-material.css ('k') | chrome/browser/resources/pdf/pdf.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698