summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/importer_lock_view.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-06 01:56:21 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-06 01:56:21 +0000
commit9394fa97725f4f4af43d445c29c71fbd6e555283 (patch)
treefc2edcd81a8dfe1e3475177f7ebf069c83da2772 /chrome/browser/views/importer_lock_view.cc
parent036d87726035ac500ba35ab41fdc9ef6128f0e4f (diff)
downloadchromium_src-9394fa97725f4f4af43d445c29c71fbd6e555283.zip
chromium_src-9394fa97725f4f4af43d445c29c71fbd6e555283.tar.gz
chromium_src-9394fa97725f4f4af43d445c29c71fbd6e555283.tar.bz2
Allow the import lock dialog to be sized by locale.
Also increase the height of the Italian first run bubble. BUG=1334381,1359145 Review URL: http://codereview.chromium.org/482 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/importer_lock_view.cc')
-rw-r--r--chrome/browser/views/importer_lock_view.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc
index d1c5f2f..bf57ab2 100644
--- a/chrome/browser/views/importer_lock_view.cc
+++ b/chrome/browser/views/importer_lock_view.cc
@@ -4,10 +4,12 @@
#include "chrome/browser/views/importer_lock_view.h"
+#include "chrome/app/locales/locale_settings.h"
#include "chrome/browser/importer.h"
#include "chrome/browser/standard_layout.h"
#include "chrome/common/l10n_util.h"
#include "chrome/views/label.h"
+#include "chrome/views/window.h"
#include "chromium_strings.h"
#include "generated_resources.h"
@@ -33,14 +35,16 @@ ImporterLockView::~ImporterLockView() {
}
void ImporterLockView::GetPreferredSize(CSize *out) {
- out->cx = kDefaultWindowWidth;
- out->cy = kDefaultWindowHeight;
+ DCHECK(out);
+ *out = ChromeViews::Window::GetLocalizedContentsSize(
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS,
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES).ToSIZE();
}
void ImporterLockView::Layout() {
description_label_->SetBounds(kPanelHorizMargin, kPanelVertMargin,
- kDefaultWindowWidth - 2 * kPanelHorizMargin,
- kDefaultWindowHeight - 2 * kPanelVertMargin);
+ GetWidth() - 2 * kPanelHorizMargin,
+ GetHeight() - 2 * kPanelVertMargin);
}
std::wstring ImporterLockView::GetDialogButtonLabel(