OLD | NEW |
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/settings/tray_settings.h" | 5 #include "ash/system/settings/tray_settings.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 66 |
67 } // namespace | 67 } // namespace |
68 | 68 |
69 namespace ash { | 69 namespace ash { |
70 namespace internal { | 70 namespace internal { |
71 | 71 |
72 TraySettings::TraySettings() {} | 72 TraySettings::TraySettings() {} |
73 | 73 |
74 TraySettings::~TraySettings() {} | 74 TraySettings::~TraySettings() {} |
75 | 75 |
76 views::View* TraySettings::CreateTrayView() { | 76 views::View* TraySettings::CreateTrayView(user::LoginStatus status) { |
77 return NULL; | 77 return NULL; |
78 } | 78 } |
79 | 79 |
80 views::View* TraySettings::CreateDefaultView() { | 80 views::View* TraySettings::CreateDefaultView(user::LoginStatus status) { |
| 81 if (status == user::LOGGED_IN_NONE) |
| 82 return NULL; |
| 83 |
81 views::View* container = new views::View; | 84 views::View* container = new views::View; |
82 views::BoxLayout* layout = | 85 views::BoxLayout* layout = |
83 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 5); | 86 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 5); |
84 layout->set_spread_blank_space(true); | 87 layout->set_spread_blank_space(true); |
85 container->SetLayoutManager(layout); | 88 container->SetLayoutManager(layout); |
86 | 89 |
87 views::View* settings = new SettingsView; | 90 views::View* settings = new SettingsView; |
88 container->AddChildView(settings); | 91 container->AddChildView(settings); |
89 return container; | 92 return container; |
90 } | 93 } |
91 | 94 |
92 views::View* TraySettings::CreateDetailedView() { | 95 views::View* TraySettings::CreateDetailedView(user::LoginStatus status) { |
93 NOTIMPLEMENTED(); | 96 NOTIMPLEMENTED(); |
94 return NULL; | 97 return NULL; |
95 } | 98 } |
96 | 99 |
97 void TraySettings::DestroyTrayView() { | 100 void TraySettings::DestroyTrayView() { |
98 } | 101 } |
99 | 102 |
100 void TraySettings::DestroyDefaultView() { | 103 void TraySettings::DestroyDefaultView() { |
101 } | 104 } |
102 | 105 |
103 void TraySettings::DestroyDetailedView() { | 106 void TraySettings::DestroyDetailedView() { |
104 } | 107 } |
105 | 108 |
106 } // namespace internal | 109 } // namespace internal |
107 } // namespace ash | 110 } // namespace ash |
OLD | NEW |