| Index: ash/system/ime/tray_ime.h
|
| diff --git a/ash/system/ime/tray_ime.h b/ash/system/ime/tray_ime.h
|
| index 452e890a186b09222db60bc4d159431873b82ccd..36f036a9be8cd32f8e037a8105dcb58a3e76d0f0 100644
|
| --- a/ash/system/ime/tray_ime.h
|
| +++ b/ash/system/ime/tray_ime.h
|
| @@ -8,7 +8,6 @@
|
|
|
| #include "ash/system/ime/ime_observer.h"
|
| #include "ash/system/tray/system_tray_item.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace views {
|
| class Label;
|
| @@ -48,9 +47,9 @@ class TrayIME : public SystemTrayItem,
|
| // Overridden from IMEObserver.
|
| virtual void OnIMERefresh() OVERRIDE;
|
|
|
| - scoped_ptr<TrayItemView> tray_label_;
|
| - scoped_ptr<tray::IMEDefaultView> default_;
|
| - scoped_ptr<tray::IMEDetailedView> detailed_;
|
| + TrayItemView* tray_label_;
|
| + tray::IMEDefaultView* default_;
|
| + tray::IMEDetailedView* detailed_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TrayIME);
|
| };
|
|
|