Merge 33798 - Fix download dialog truncation in German locale....

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 44 matching lines @@
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/native_window_notification_source.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/webkit_resources.h"
 #include "views/controls/single_split_view.h"
 #include "views/fill_layout.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/grid_layout.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/non_client_view.h"
@@ skipping 244 matching lines @@
     warning_->set_border(views::Border::CreateEmptyBorder(10, 10, 10, 10));
     layout->StartRow(0, columnset_id);
     layout->AddView(warning_);
 
     explanation_ = new views::Label(explanation_text);
     explanation_->SetMultiLine(true);
     explanation_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     explanation_->set_border(views::Border::CreateEmptyBorder(10, 10, 10, 10));
     layout->StartRow(0, columnset_id);
     layout->AddView(explanation_);
+
+    dialog_dimensions_ = views::Window::GetLocalizedContentsSize(
+        IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS,
+        IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES);
+    const int height =
+        warning_->GetHeightForWidth(dialog_dimensions_.width()) +
+        explanation_->GetHeightForWidth(dialog_dimensions_.width());
+    dialog_dimensions_.set_height(std::max(height,
+                                           dialog_dimensions_.height()));
   }
 
   ~DownloadInProgressConfirmDialogDelegate() {
   }
 
   // View implementation:
   virtual gfx::Size GetPreferredSize() {
-    const int kContentWidth = 400;
-    const int height = warning_->GetHeightForWidth(kContentWidth) +
-                       explanation_->GetHeightForWidth(kContentWidth);
-    return gfx::Size(kContentWidth, height);
+    return dialog_dimensions_;
   }
 
   // DialogDelegate implementation:
   virtual int GetDefaultDialogButton() const {
     return MessageBoxFlags::DIALOGBUTTON_CANCEL;
   }
 
   virtual std::wstring GetDialogButtonLabel(
       MessageBoxFlags::DialogButton button) const {
     if (button == MessageBoxFlags::DIALOGBUTTON_OK)
@@ skipping 27 matching lines @@
  private:
   Browser* browser_;
   views::Label* warning_;
   views::Label* explanation_;
 
   std::wstring ok_button_text_;
   std::wstring cancel_button_text_;
 
   std::wstring product_name_;
 
+  gfx::Size dialog_dimensions_;
+
   DISALLOW_COPY_AND_ASSIGN(DownloadInProgressConfirmDialogDelegate);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
 // static
 void BrowserView::SetShowState(int state) {
   explicit_show_state = state;
 }
@@ skipping 1884 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }