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

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: Fix single-letter typo :(. 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
« no previous file with comments | « ash/system/tray/tray_empty.h ('k') | ash/system/tray/tray_image_item.h » ('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 #include "ash/system/tray/tray_empty.h" 5 #include "ash/system/tray/tray_empty.h"
6 6
7 #include "ui/views/layout/box_layout.h" 7 #include "ui/views/layout/box_layout.h"
8 #include "ui/views/background.h" 8 #include "ui/views/background.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
11 namespace { 11 namespace {
12 12
13 class EmptyBackground : public views::Background { 13 class EmptyBackground : public views::Background {
14 public: 14 public:
15 EmptyBackground() {} 15 EmptyBackground() {}
16 virtual ~EmptyBackground() {} 16 virtual ~EmptyBackground() {}
17 17
18 private: 18 private:
19 virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE { 19 virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
20 } 20 }
21 21
22 DISALLOW_COPY_AND_ASSIGN(EmptyBackground); 22 DISALLOW_COPY_AND_ASSIGN(EmptyBackground);
23 }; 23 };
24 24
25 } 25 }
26 26
27 namespace ash { 27 namespace ash {
28 namespace internal { 28 namespace internal {
29 29
30 TrayEmpty::TrayEmpty() {} 30 TrayEmpty::TrayEmpty(SystemTray* system_tray)
31 : SystemTrayItem(system_tray) {
32 }
31 33
32 TrayEmpty::~TrayEmpty() {} 34 TrayEmpty::~TrayEmpty() {}
33 35
34 views::View* TrayEmpty::CreateTrayView(user::LoginStatus status) { 36 views::View* TrayEmpty::CreateTrayView(user::LoginStatus status) {
35 return NULL; 37 return NULL;
36 } 38 }
37 39
38 views::View* TrayEmpty::CreateDefaultView(user::LoginStatus status) { 40 views::View* TrayEmpty::CreateDefaultView(user::LoginStatus status) {
39 if (status == user::LOGGED_IN_NONE) 41 if (status == user::LOGGED_IN_NONE)
40 return NULL; 42 return NULL;
(...skipping 15 matching lines...) Expand all
56 void TrayEmpty::DestroyTrayView() {} 58 void TrayEmpty::DestroyTrayView() {}
57 59
58 void TrayEmpty::DestroyDefaultView() {} 60 void TrayEmpty::DestroyDefaultView() {}
59 61
60 void TrayEmpty::DestroyDetailedView() {} 62 void TrayEmpty::DestroyDetailedView() {}
61 63
62 void TrayEmpty::UpdateAfterLoginStatusChange(user::LoginStatus status) {} 64 void TrayEmpty::UpdateAfterLoginStatusChange(user::LoginStatus status) {}
63 65
64 } // namespace internal 66 } // namespace internal
65 } // namespace ash 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_empty.h ('k') | ash/system/tray/tray_image_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698