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

Side by Side Diff: ash/system/tray_caps_lock.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/tray_accessibility.cc ('k') | ash/system/tray_caps_lock.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_TRAY_CAPS_LOCK_H_ 5 #ifndef ASH_SYSTEM_TRAY_CAPS_LOCK_H_
6 #define ASH_SYSTEM_TRAY_CAPS_LOCK_H_ 6 #define ASH_SYSTEM_TRAY_CAPS_LOCK_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/tray/tray_image_item.h" 9 #include "ash/system/tray/tray_image_item.h"
10 10
(...skipping 27 matching lines...) Expand all
38 virtual bool GetInitialVisibility() OVERRIDE; 38 virtual bool GetInitialVisibility() OVERRIDE;
39 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 39 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
40 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
41 virtual void DestroyDefaultView() OVERRIDE; 41 virtual void DestroyDefaultView() OVERRIDE;
42 virtual void DestroyDetailedView() OVERRIDE; 42 virtual void DestroyDetailedView() OVERRIDE;
43 43
44 // Overridden from CapsLockObserver. 44 // Overridden from CapsLockObserver.
45 virtual void OnCapsLockChanged(bool enabled, 45 virtual void OnCapsLockChanged(bool enabled,
46 bool search_mapped_to_caps_lock) OVERRIDE; 46 bool search_mapped_to_caps_lock) OVERRIDE;
47 47
48 scoped_ptr<CapsLockDefaultView> default_; 48 CapsLockDefaultView* default_;
49 scoped_ptr<views::View> detailed_; 49 views::View* detailed_;
50 50
51 bool search_mapped_to_caps_lock_; 51 bool search_mapped_to_caps_lock_;
52 bool caps_lock_enabled_; 52 bool caps_lock_enabled_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock); 54 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock);
55 }; 55 };
56 56
57 } // namespace internal 57 } // namespace internal
58 } // namespace ash 58 } // namespace ash
59 59
60 #endif // ASH_SYSTEM_TRAY_CAPS_LOCK_H_ 60 #endif // ASH_SYSTEM_TRAY_CAPS_LOCK_H_
OLDNEW
« no previous file with comments | « ash/system/tray_accessibility.cc ('k') | ash/system/tray_caps_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698