Convert menu strings to UTF16, fix some views-GTK build errors.

views/widget/widget_gtk.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 "views/widget/widget_gtk.h"
 
 #include "app/gfx/path.h"
 #include "base/compiler_specific.h"
 #include "views/fill_layout.h"
 #include "views/widget/default_theme_provider.h"
@@ skipping 59 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       delete_on_destroy_(true),
       transparent_(false) {
 }
 
 WidgetGtk::~WidgetGtk() {
   MessageLoopForUI::current()->RemoveObserver(this);
 }
 
 void WidgetGtk::Init(GtkWidget* parent,
-                     const gfx::Rect& bounds,
-                     bool has_own_focus_manager) {
+                     const gfx::Rect& bounds) {
   // Force creation of the RootView if it hasn't been created yet.
   GetRootView();
 
 #if !defined(LINUX2)
   default_theme_provider_.reset(new DefaultThemeProvider());
 #endif
 
   // Make container here.
   CreateGtkWidget(parent, bounds);
 
   // Make sure we receive our motion events.
 
   // In general we register most events on the parent of all widgets. At a
   // minimum we need painting to happen on the parent (otherwise painting
   // doesn't work at all), and similarly we need mouse release events on the
   // parent as windows don't get mouse releases.
   gtk_widget_add_events(window_contents_,
                         GDK_ENTER_NOTIFY_MASK |
                         GDK_LEAVE_NOTIFY_MASK |
                         GDK_BUTTON_PRESS_MASK |
                         GDK_BUTTON_RELEASE_MASK |
                         GDK_POINTER_MOTION_MASK |
                         GDK_KEY_PRESS_MASK |
                         GDK_KEY_RELEASE_MASK);
 
   root_view_->OnWidgetCreated();
 
-  // TODO(port): if(has_own_focus_manager) block
-
   SetRootViewForWidget(widget_, root_view_.get());
 
   MessageLoopForUI::current()->AddObserver(this);
 
   // TODO(beng): make these take this rather than NULL.
   g_signal_connect_after(G_OBJECT(window_contents_), "size_allocate",
                          G_CALLBACK(CallSizeAllocate), NULL);
   g_signal_connect(G_OBJECT(window_contents_), "expose_event",
                    G_CALLBACK(CallPaint), NULL);
   g_signal_connect(G_OBJECT(window_contents_), "enter_notify_event",
@@ skipping 701 matching lines @@
 void WidgetGtk::HandleGrabBroke() {
   if (has_capture_) {
     if (is_mouse_down_)
       root_view_->ProcessMouseDragCanceled();
     is_mouse_down_ = false;
     has_capture_ = false;
   }
 }
 
 }  // namespace views