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/extensions | |
| 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/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_browser_event_router.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_browser_event_router.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index 54e54ee..e0341a5 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -114,7 +114,7 @@ void ExtensionBrowserEventRouter::Init() { #if defined(TOOLKIT_VIEWS) views::FocusManager::GetWidgetFocusManager()->AddFocusChangeListener(this); #elif defined(TOOLKIT_GTK) - ActiveWindowWatcherX::AddObserver(this); + ui::ActiveWindowWatcherX::AddObserver(this); #elif defined(OS_MACOSX) // Needed for when no suitable window can be passed to an extension as the // currently focused window. @@ -154,7 +154,7 @@ ExtensionBrowserEventRouter::~ExtensionBrowserEventRouter() { #if defined(TOOLKIT_VIEWS) views::FocusManager::GetWidgetFocusManager()->RemoveFocusChangeListener(this); #elif defined(TOOLKIT_GTK) - ActiveWindowWatcherX::RemoveObserver(this); + ui::ActiveWindowWatcherX::RemoveObserver(this); #endif } diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h index a78dea8..27c562d 100644 --- a/chrome/browser/extensions/extension_browser_event_router.h +++ b/chrome/browser/extensions/extension_browser_event_router.h @@ -18,7 +18,7 @@ #include "views/view.h" #include "views/focus/focus_manager.h" #elif defined(TOOLKIT_GTK) -#include "app/active_window_watcher_x.h" +#include "ui/base/x/active_window_watcher_x.h" #endif // The ExtensionBrowserEventRouter listens to Browser window & tab events @@ -30,7 +30,7 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver, #if defined(TOOLKIT_VIEWS) public views::WidgetFocusChangeListener, #elif defined(TOOLKIT_GTK) - public ActiveWindowWatcherX::Observer, + public ui::ActiveWindowWatcherX::Observer, #endif public BrowserList::Observer, public NotificationObserver { |