diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
| commit | a5176dafb70d5ea7567b18917d85c4cddc937dc4 (patch) | |
| tree | 45a3a875cb48ee3b54a536ba9a4a7a5902138650 /chrome/browser/browser_main.cc | |
| parent | 8e12ae06a009107635e2045db802907fd4ae2df1 (diff) | |
| download | chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.zip chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.gz chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.bz2 | |
Convert menu strings to UTF16, fix some views-GTK build errors.
Review URL: http://codereview.chromium.org/150171
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index cc39d22..b29fa21 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -92,7 +92,6 @@ #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" @@ -109,6 +108,8 @@ #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 { |