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

chrome/browser/browser_main.cc

 // Copyright (c) 2006-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 "build/build_config.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 74 matching lines @@
 #include "base/registry.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/rlz/rlz.h"
-#include "chrome/browser/views/chrome_views_delegate.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/version.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/winsock_init.h"
 #include "net/http/http_network_layer.h"
 #include "sandbox/src/sandbox.h"
 #include "views/widget/accelerator_handler.h"
 #endif  // defined(OS_WIN)
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/common/gtk_util.h"
+#elif defined(TOOLKIT_VIEWS)
+#include "chrome/browser/views/chrome_views_delegate.h"
 #endif
 
 namespace Platform {
 
 void WillInitializeMainMessageLoop(const CommandLine & command_line);
 void WillTerminate();
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 // Perform any platform-specific work that needs to be done before the main
 // message loop is created and initialized.
@@ skipping 675 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }