OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/ui/views/aura/status_area_host_aura.h" | 5 #include "chrome/browser/ui/views/aura/status_area_host_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/profiles/profile_manager.h" | 8 #include "chrome/browser/profiles/profile_manager.h" |
9 #include "chrome/browser/ui/browser_list.h" | 9 #include "chrome/browser/ui/browser_list.h" |
10 #include "chrome/browser/ui/view_ids.h" | 10 #include "chrome/browser/ui/view_ids.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #endif | 24 #endif |
25 | 25 |
26 StatusAreaHostAura::StatusAreaHostAura() | 26 StatusAreaHostAura::StatusAreaHostAura() |
27 : status_area_widget_(NULL), | 27 : status_area_widget_(NULL), |
28 status_area_view_(NULL) { | 28 status_area_view_(NULL) { |
29 } | 29 } |
30 | 30 |
31 StatusAreaHostAura::~StatusAreaHostAura() { | 31 StatusAreaHostAura::~StatusAreaHostAura() { |
32 } | 32 } |
33 | 33 |
34 const views::View* StatusAreaHostAura::GetStatusArea() const { | 34 views::View* StatusAreaHostAura::GetStatusAreaForTest() { |
35 return status_area_view_; | 35 return status_area_view_; |
36 } | 36 } |
37 | 37 |
38 views::Widget* StatusAreaHostAura::CreateStatusArea() { | 38 views::Widget* StatusAreaHostAura::CreateStatusArea() { |
39 aura_shell::Shell* aura_shell = aura_shell::Shell::GetInstance(); | 39 aura_shell::Shell* aura_shell = aura_shell::Shell::GetInstance(); |
40 aura::Window* status_window = aura_shell->GetContainer( | 40 aura::Window* status_window = aura_shell->GetContainer( |
41 aura_shell::internal::kShellWindowId_StatusContainer); | 41 aura_shell::internal::kShellWindowId_StatusContainer); |
42 | 42 |
43 // Create status area view. | 43 // Create status area view. |
44 status_area_view_ = new StatusAreaView(); | 44 status_area_view_ = new StatusAreaView(); |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 } | 114 } |
115 | 115 |
116 StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const { | 116 StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const { |
117 return StatusAreaButton::WHITE_HALOED; | 117 return StatusAreaButton::WHITE_HALOED; |
118 } | 118 } |
119 | 119 |
120 void StatusAreaHostAura::ButtonVisibilityChanged(views::View* button_view) { | 120 void StatusAreaHostAura::ButtonVisibilityChanged(views::View* button_view) { |
121 if (status_area_view_) | 121 if (status_area_view_) |
122 status_area_view_->UpdateButtonVisibility(); | 122 status_area_view_->UpdateButtonVisibility(); |
123 } | 123 } |
OLD | NEW |