3 files changed, 52 insertions, 27 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index b81e75f..fc872f0 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -258,10 +258,14 @@ bool DialogClientView::CanClose() const {
 }
 
 void DialogClientView::WindowClosing() {
+#if !defined(TOOLKIT_VIEWS)
   FocusManager* focus_manager = GetFocusManager();
   DCHECK(focus_manager);
   if (focus_manager)
      focus_manager->RemoveFocusChangeListener(this);
+#else
+  NOTIMPLEMENTED();
+#endif
   ClientView::WindowClosing();
 }
 
@@ -304,12 +308,16 @@ void DialogClientView::ViewHierarchyChanged(bool is_add, View* parent,
     ShowDialogButtons();
     ClientView::ViewHierarchyChanged(is_add, parent, child);
 
+#if !defined(TOOLKIT_VIEWS)
     FocusManager* focus_manager = GetFocusManager();
     // Listen for focus change events so we can update the default button.
     DCHECK(focus_manager);  // bug #1291225: crash reports seem to indicate it
                             // can be NULL.
     if (focus_manager)
       focus_manager->AddFocusChangeListener(this);
+#else
+    NOTIMPLEMENTED();
+#endif
 
     // The "extra view" must be created and installed after the contents view
     // has been inserted into the view hierarchy.
diff --git a/views/window/window.cc b/views/window/window.cc
new file mode 100644
index 0000000..5a41c4f
--- /dev/null
+++ b/views/window/window.cc
@@ -0,0 +1,44 @@
+// 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 "views/window/window.h"
+
+#include "app/gfx/font.h"
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "base/gfx/size.h"
+#include "base/string_util.h"
+
+namespace views {
+
+// static
+int Window::GetLocalizedContentsWidth(int col_resource_id) {
+  double chars = 0;
+  StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), &chars);
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
+  int width = font.GetExpectedTextWidth(static_cast<int>(chars));
+  DCHECK(width > 0);
+  return width;
+}
+
+// static
+int Window::GetLocalizedContentsHeight(int row_resource_id) {
+  double lines = 0;
+  StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), &lines);
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
+  int height = static_cast<int>(font.height() * lines);
+  DCHECK(height > 0);
+  return height;
+}
+
+// static
+gfx::Size Window::GetLocalizedContentsSize(int col_resource_id,
+                                           int row_resource_id) {
+  return gfx::Size(GetLocalizedContentsWidth(col_resource_id),
+                   GetLocalizedContentsHeight(row_resource_id));
+}
+
+}  // namespace views
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index f683822..fc809932 100755
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -232,33 +232,6 @@ void WindowWin::FrameTypeChanged() {
   EnumChildWindows(GetNativeView(), &SendDwmCompositionChanged, NULL);
 }
 
-// static
-int Window::GetLocalizedContentsWidth(int col_resource_id) {
-  double chars = _wtof(l10n_util::GetString(col_resource_id).c_str());
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
-  int width = font.GetExpectedTextWidth(static_cast<int>(chars));
-  DCHECK(width > 0);
-  return width;
-}
-
-// static
-int Window::GetLocalizedContentsHeight(int row_resource_id) {
-  double lines = _wtof(l10n_util::GetString(row_resource_id).c_str());
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
-  int height = static_cast<int>(font.height() * lines);
-  DCHECK(height > 0);
-  return height;
-}
-
-// static
-gfx::Size Window::GetLocalizedContentsSize(int col_resource_id,
-                                           int row_resource_id) {
-  return gfx::Size(GetLocalizedContentsWidth(col_resource_id),
-                   GetLocalizedContentsHeight(row_resource_id));
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // WindowWin, Window implementation: