summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 06:49:10 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 06:49:10 +0000
commiteef2857f77263b2e8e872773a8157271e09719ef (patch)
treeca061a658c42a14db345c4ae5b7fa6e548fbcc3f /chrome
parentddd61db54184ca4491521f8ce8f4e50a4ca5025f (diff)
downloadchromium_src-eef2857f77263b2e8e872773a8157271e09719ef.zip
chromium_src-eef2857f77263b2e8e872773a8157271e09719ef.tar.gz
chromium_src-eef2857f77263b2e8e872773a8157271e09719ef.tar.bz2
Fix print preview control button order for views.
BUG=104236 TEST=see bug, also chrome.toolkit is available in print preview's JS console. Review URL: http://codereview.chromium.org/8619009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/print_preview/print_preview.css6
-rw-r--r--chrome/browser/resources/print_preview/print_preview.html2
-rw-r--r--chrome/browser/ui/webui/constrained_html_ui.cc2
3 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/resources/print_preview/print_preview.css b/chrome/browser/resources/print_preview/print_preview.css
index 4b94f10..ed5c833 100644
--- a/chrome/browser/resources/print_preview/print_preview.css
+++ b/chrome/browser/resources/print_preview/print_preview.css
@@ -413,6 +413,10 @@ html[dir='rtl'] #decrement {
display: -webkit-box;
}
-html[toolkit=views] .button-strip {
+html:not([toolkit=views]) .button-strip {
-webkit-box-direction: reverse;
}
+
+.button-strip button {
+ display: block;
+}
diff --git a/chrome/browser/resources/print_preview/print_preview.html b/chrome/browser/resources/print_preview/print_preview.html
index 3416cec..3bad87e 100644
--- a/chrome/browser/resources/print_preview/print_preview.html
+++ b/chrome/browser/resources/print_preview/print_preview.html
@@ -28,9 +28,9 @@
<div id="print-header">
<span id="print-summary"></span>
<div class="button-strip">
- <button id="cancel-button" i18n-content="cancelButton"></button>
<button id="print-button" i18n-content="printButton" class="default">
</button>
+ <button id="cancel-button" i18n-content="cancelButton"></button>
</div>
</div>
</header>
diff --git a/chrome/browser/ui/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc
index 9afb84c..bcc2ecf 100644
--- a/chrome/browser/ui/webui/constrained_html_ui.cc
+++ b/chrome/browser/ui/webui/constrained_html_ui.cc
@@ -53,6 +53,8 @@ void ConstrainedHtmlUI::RenderViewCreated(RenderViewHost* render_view_host) {
chrome::NOTIFICATION_HTML_DIALOG_SHOWN,
content::Source<WebUI>(this),
content::Details<RenderViewHost>(render_view_host));
+
+ ChromeWebUI::RenderViewCreated(render_view_host);
}
void ConstrainedHtmlUI::OnDialogCloseMessage(const ListValue* args) {