Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Side by Side Diff: ash/system/ime/tray_ime.h

Issue 10269017: Remove scoped_ptr for system tray views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/date/tray_date.cc ('k') | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SYSTEM_IME_TRAY_IME_H_ 5 #ifndef ASH_SYSTEM_IME_TRAY_IME_H_
6 #define ASH_SYSTEM_IME_TRAY_IME_H_ 6 #define ASH_SYSTEM_IME_TRAY_IME_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/ime/ime_observer.h" 9 #include "ash/system/ime/ime_observer.h"
10 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
11 #include "base/memory/scoped_ptr.h"
12 11
13 namespace views { 12 namespace views {
14 class Label; 13 class Label;
15 } 14 }
16 15
17 namespace ash { 16 namespace ash {
18 17
19 struct IMEInfo; 18 struct IMEInfo;
20 19
21 namespace internal { 20 namespace internal {
(...skipping 19 matching lines...) Expand all
41 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
42 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
43 virtual void DestroyTrayView() OVERRIDE; 42 virtual void DestroyTrayView() OVERRIDE;
44 virtual void DestroyDefaultView() OVERRIDE; 43 virtual void DestroyDefaultView() OVERRIDE;
45 virtual void DestroyDetailedView() OVERRIDE; 44 virtual void DestroyDetailedView() OVERRIDE;
46 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 45 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
47 46
48 // Overridden from IMEObserver. 47 // Overridden from IMEObserver.
49 virtual void OnIMERefresh() OVERRIDE; 48 virtual void OnIMERefresh() OVERRIDE;
50 49
51 scoped_ptr<TrayItemView> tray_label_; 50 TrayItemView* tray_label_;
52 scoped_ptr<tray::IMEDefaultView> default_; 51 tray::IMEDefaultView* default_;
53 scoped_ptr<tray::IMEDetailedView> detailed_; 52 tray::IMEDetailedView* detailed_;
54 53
55 DISALLOW_COPY_AND_ASSIGN(TrayIME); 54 DISALLOW_COPY_AND_ASSIGN(TrayIME);
56 }; 55 };
57 56
58 } // namespace internal 57 } // namespace internal
59 } // namespace ash 58 } // namespace ash
60 59
61 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ 60 #endif // ASH_SYSTEM_IME_TRAY_IME_H_
OLDNEW
« no previous file with comments | « ash/system/date/tray_date.cc ('k') | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698