| Index: ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
|
| index 291512c41bac3578e911315f4b7b859d4ca3d352..2c551621b785ce074212f19defa916123e0110ed 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
|
| @@ -107,7 +107,7 @@ class VIEWS_EXPORT DesktopRootWindowHostX11 :
|
| virtual bool HasCapture() const OVERRIDE;
|
| virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
|
| virtual bool IsAlwaysOnTop() const OVERRIDE;
|
| - virtual bool SetWindowTitle(const string16& title) OVERRIDE;
|
| + virtual bool SetWindowTitle(const base::string16& title) OVERRIDE;
|
| virtual void ClearNativeFocus() OVERRIDE;
|
| virtual Widget::MoveLoopResult RunMoveLoop(
|
| const gfx::Vector2d& drag_offset,
|
| @@ -284,7 +284,7 @@ private:
|
|
|
| scoped_ptr<X11ScopedCapture> x11_capture_;
|
|
|
| - string16 window_title_;
|
| + base::string16 window_title_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostX11);
|
| };
|
|
|