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/plugin | |
| 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/plugin')
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 4 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_proxy.cc | 15 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_proxy.h | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index 1400e4a..280a6a2 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -38,7 +38,7 @@ #endif #if defined(USE_X11) -#include "app/x11_util.h" +#include "ui/base/x/x11_util.h" #elif defined(OS_MACOSX) #include "app/l10n_util.h" #include "base/mac/mac_util.h" @@ -76,7 +76,7 @@ PluginThread::PluginThread() setenv("GDK_NATIVE_WINDOWS", "1", 1); } - x11_util::SetDefaultX11ErrorHandlers(); + ui::SetDefaultX11ErrorHandlers(); #endif PatchNPNFunctions(); diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index a7c6106..6448239 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -35,7 +35,7 @@ #endif #if defined(USE_X11) -#include "app/x11_util_internal.h" +#include "ui/base/x/x11_util_internal.h" #endif using WebKit::WebBindings; @@ -73,10 +73,9 @@ WebPluginProxy::WebPluginProxy( // If the X server supports SHM pixmaps // and the color depth and masks match, // then consider using SHM pixmaps for windowless plugin painting. - Display* display = x11_util::GetXDisplay(); - if (x11_util::QuerySharedMemorySupport(display) == - x11_util::SHARED_MEMORY_PIXMAP && - x11_util::BitsPerPixelForPixmapDepth( + Display* display = ui::GetXDisplay(); + if (ui::QuerySharedMemorySupport(display) == ui::SHARED_MEMORY_PIXMAP && + ui::BitsPerPixelForPixmapDepth( display, DefaultDepth(display, 0)) == 32) { Visual* vis = DefaultVisual(display, 0); @@ -94,7 +93,7 @@ WebPluginProxy::~WebPluginProxy() { #if defined(USE_X11) if (windowless_shm_pixmap_ != None) - XFreePixmap(x11_util::GetXDisplay(), windowless_shm_pixmap_); + XFreePixmap(ui::GetXDisplay(), windowless_shm_pixmap_); #endif #if defined(OS_MACOSX) @@ -618,8 +617,8 @@ void WebPluginProxy::SetWindowlessBuffer( // If SHM pixmaps support is available, create a SHM pixmap and // pass it to the delegate for windowless plugin painting. if (delegate_->IsWindowless() && use_shm_pixmap_ && windowless_dib_.get()) { - Display* display = x11_util::GetXDisplay(); - XID root_window = x11_util::GetX11RootWindow(); + Display* display = ui::GetXDisplay(); + XID root_window = ui::GetX11RootWindow(); XShmSegmentInfo shminfo = {0}; if (windowless_shm_pixmap_ != None) diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h index 2a1f1aee..c5a0a1d 100644 --- a/chrome/plugin/webplugin_proxy.h +++ b/chrome/plugin/webplugin_proxy.h @@ -9,7 +9,7 @@ #include <string> #if defined(USE_X11) -#include "app/x11_util.h" +#include "ui/base/x/x11_util.h" #endif #include "app/surface/transport_dib.h" #include "base/hash_tables.h" |