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

Side by Side Diff: ash/system/tray/tray_empty.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modified CL to provide TrayItems and Tray*Views with parent pointers instead. Created 8 years, 1 month 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
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 #include "ash/system/tray/tray_empty.h" 5 #include "ash/system/tray/tray_empty.h"
6 6
7 #include "ash/system/tray/system_tray.h"
7 #include "ui/views/layout/box_layout.h" 8 #include "ui/views/layout/box_layout.h"
8 #include "ui/views/background.h" 9 #include "ui/views/background.h"
9 #include "ui/views/view.h" 10 #include "ui/views/view.h"
10 11
11 namespace { 12 namespace {
12 13
13 class EmptyBackground : public views::Background { 14 class EmptyBackground : public views::Background {
14 public: 15 public:
15 EmptyBackground() {} 16 EmptyBackground() {}
16 virtual ~EmptyBackground() {} 17 virtual ~EmptyBackground() {}
17 18
18 private: 19 private:
19 virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE { 20 virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
20 } 21 }
21 22
22 DISALLOW_COPY_AND_ASSIGN(EmptyBackground); 23 DISALLOW_COPY_AND_ASSIGN(EmptyBackground);
23 }; 24 };
24 25
25 } 26 }
26 27
27 namespace ash { 28 namespace ash {
28 namespace internal { 29 namespace internal {
29 30
30 TrayEmpty::TrayEmpty() {} 31 TrayEmpty::TrayEmpty(SystemTray* system_tray)
32 : SystemTrayItem(system_tray) {
33 }
31 34
32 TrayEmpty::~TrayEmpty() {} 35 TrayEmpty::~TrayEmpty() {}
33 36
34 views::View* TrayEmpty::CreateTrayView(user::LoginStatus status) { 37 views::View* TrayEmpty::CreateTrayView(user::LoginStatus status) {
35 return NULL; 38 return NULL;
36 } 39 }
37 40
38 views::View* TrayEmpty::CreateDefaultView(user::LoginStatus status) { 41 views::View* TrayEmpty::CreateDefaultView(user::LoginStatus status) {
39 if (status == user::LOGGED_IN_NONE) 42 if (status == user::LOGGED_IN_NONE)
40 return NULL; 43 return NULL;
(...skipping 15 matching lines...) Expand all
56 void TrayEmpty::DestroyTrayView() {} 59 void TrayEmpty::DestroyTrayView() {}
57 60
58 void TrayEmpty::DestroyDefaultView() {} 61 void TrayEmpty::DestroyDefaultView() {}
59 62
60 void TrayEmpty::DestroyDetailedView() {} 63 void TrayEmpty::DestroyDetailedView() {}
61 64
62 void TrayEmpty::UpdateAfterLoginStatusChange(user::LoginStatus status) {} 65 void TrayEmpty::UpdateAfterLoginStatusChange(user::LoginStatus status) {}
63 66
64 } // namespace internal 67 } // namespace internal
65 } // namespace ash 68 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698