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 "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/browser/chromeos/status/clock_menu_button.h" | 10 #include "chrome/browser/chromeos/status/clock_menu_button.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 } | 32 } |
33 | 33 |
34 StatusAreaHostAura::~StatusAreaHostAura() { | 34 StatusAreaHostAura::~StatusAreaHostAura() { |
35 } | 35 } |
36 | 36 |
37 StatusAreaView* StatusAreaHostAura::GetStatusArea() { | 37 StatusAreaView* StatusAreaHostAura::GetStatusArea() { |
38 return status_area_view_; | 38 return status_area_view_; |
39 } | 39 } |
40 | 40 |
41 views::Widget* StatusAreaHostAura::CreateStatusArea() { | 41 views::Widget* StatusAreaHostAura::CreateStatusArea() { |
42 aura_shell::Shell* aura_shell = aura_shell::Shell::GetInstance(); | 42 ash::Shell* shell = ash::Shell::GetInstance(); |
43 aura::Window* status_window = aura_shell->GetContainer( | 43 aura::Window* status_window = shell->GetContainer( |
44 aura_shell::internal::kShellWindowId_StatusContainer); | 44 ash::internal::kShellWindowId_StatusContainer); |
45 | 45 |
46 // Create status area view. | 46 // Create status area view. |
47 status_area_view_ = new StatusAreaView(); | 47 status_area_view_ = new StatusAreaView(); |
48 | 48 |
49 // Add child buttons. | 49 // Add child buttons. |
50 #if defined(OS_CHROMEOS) | 50 #if defined(OS_CHROMEOS) |
51 ClockMenuButton* clock = NULL; | 51 ClockMenuButton* clock = NULL; |
52 chromeos::StatusAreaViewChromeos::AddChromeosButtons(status_area_view_, | 52 chromeos::StatusAreaViewChromeos::AddChromeosButtons(status_area_view_, |
53 this, | 53 this, |
54 &clock); | 54 &clock); |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 } | 140 } |
141 | 141 |
142 StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const { | 142 StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const { |
143 return StatusAreaButton::WHITE_HALOED; | 143 return StatusAreaButton::WHITE_HALOED; |
144 } | 144 } |
145 | 145 |
146 void StatusAreaHostAura::ButtonVisibilityChanged(views::View* button_view) { | 146 void StatusAreaHostAura::ButtonVisibilityChanged(views::View* button_view) { |
147 if (status_area_view_) | 147 if (status_area_view_) |
148 status_area_view_->UpdateButtonVisibility(); | 148 status_area_view_->UpdateButtonVisibility(); |
149 } | 149 } |
OLD | NEW |