| Index: views/widget/widget_gtk.h
|
| ===================================================================
|
| --- views/widget/widget_gtk.h (revision 71854)
|
| +++ views/widget/widget_gtk.h (working copy)
|
| @@ -8,10 +8,10 @@
|
|
|
| #include <gtk/gtk.h>
|
|
|
| -#include "app/active_window_watcher_x.h"
|
| -#include "app/gtk_signal.h"
|
| #include "base/message_loop.h"
|
| #include "gfx/size.h"
|
| +#include "ui/base/gtk/gtk_signal.h"
|
| +#include "ui/base/x/active_window_watcher_x.h"
|
| #include "views/focus/focus_manager.h"
|
| #include "views/widget/widget.h"
|
|
|
| @@ -39,7 +39,7 @@
|
| class WidgetGtk
|
| : public Widget,
|
| public FocusTraversable,
|
| - public ActiveWindowWatcherX::Observer {
|
| + public ui::ActiveWindowWatcherX::Observer {
|
| public:
|
| // Type of widget.
|
| enum Type {
|
| @@ -158,7 +158,7 @@
|
| // size of other kinds of widgets.
|
| void GetRequestedSize(gfx::Size* out) const;
|
|
|
| - // Overriden from ActiveWindowWatcherX::Observer.
|
| + // Overriden from ui::ActiveWindowWatcherX::Observer.
|
| virtual void ActiveWindowChanged(GdkWindow* active_window);
|
|
|
| // Overridden from Widget:
|
|
|