diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 18:27:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 18:27:06 +0000 |
| commit | 9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634 (patch) | |
| tree | 3b7332926a05a1c8382eb27422c385b56b29cb24 /chrome/browser/browser_main_gtk.cc | |
| parent | a12f7fbe12afffb4b1b31ec0d6b0988f1f9a6554 (diff) | |
| download | chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.zip chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.gz chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.bz2 | |
Move a bunch of random other files to src/ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6257006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_gtk.cc')
| -rw-r--r-- | chrome/browser/browser_main_gtk.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/browser_main_gtk.cc b/chrome/browser/browser_main_gtk.cc index ec73aaf..f80daa9 100644 --- a/chrome/browser/browser_main_gtk.cc +++ b/chrome/browser/browser_main_gtk.cc @@ -8,8 +8,6 @@ #include <sys/types.h> #include <unistd.h> -#include "app/x11_util.h" -#include "app/x11_util_internal.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "chrome/browser/browser_list.h" @@ -20,6 +18,8 @@ #include "chrome/browser/zygote_host_linux.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/result_codes.h" +#include "ui/base/x/x11_util.h" +#include "ui/base/x/x11_util_internal.h" #if defined(USE_NSS) #include "base/nss_util.h" @@ -36,7 +36,7 @@ bool g_in_x11_io_error_handler = false; int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) { if (!g_in_x11_io_error_handler) - LOG(ERROR) << x11_util::GetErrorEventDescription(d, error); + LOG(ERROR) << ui::GetErrorEventDescription(d, error); return 0; } @@ -128,9 +128,7 @@ void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) { void SetBrowserX11ErrorHandlers() { // Set up error handlers to make sure profile gets written if X server // goes away. - x11_util::SetX11ErrorHandlers( - BrowserX11ErrorHandler, - BrowserX11IOErrorHandler); + ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); } #if !defined(OS_CHROMEOS) |