Porting in chrome/views/

chrome/views/label.cc

 // Copyright (c) 2006-2008 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/views/label.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 170 matching lines @@
   if (url_set_)
     return UTF8ToWide(url_.spec());
   else
     return text_;
 }
 
 const GURL Label::GetURL() const {
   if (url_set_)
     return url_;
   else
-    return GURL(text_);
+    return GURL(WideToUTF8(text_));
 }
 
 gfx::Size Label::GetTextSize() {
   if (!text_size_valid_) {
     text_size_.SetSize(font_.GetStringWidth(text_), font_.height());
     text_size_valid_ = true;
   }
 
   if (text_size_valid_)
     return text_size_;
@@ skipping 163 matching lines @@
   gfx::Insets insets = GetInsets();
   label_width += insets.width();
 
   if (max_width > 0)
     label_width = std::min(label_width, max_width);
 
   SetBounds(x(), y(), label_width, 0);
   SizeToPreferredSize();
 }
 
+#if defined(OS_WIN)
 bool Label::GetAccessibleRole(VARIANT* role) {
   DCHECK(role);
 
   role->vt = VT_I4;
   role->lVal = ROLE_SYSTEM_TEXT;
   return true;
 }
 
 bool Label::GetAccessibleName(std::wstring* name) {
   *name = GetText();
   return true;
 }
 
 bool Label::GetAccessibleState(VARIANT* state) {
   DCHECK(state);
 
   state->lVal |= STATE_SYSTEM_READONLY;
   return true;
 }
+#endif  // defined(OS_WIN)
 
 }  // namespace views