| Index: chrome/browser/ui/views/aura/status_area_host_aura.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/aura/status_area_host_aura.cc (revision 110804)
|
| +++ chrome/browser/ui/views/aura/status_area_host_aura.cc (working copy)
|
| @@ -20,7 +20,6 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
|
| -#include "chrome/browser/chromeos/status/timezone_clock_updater.h"
|
| #endif
|
|
|
| StatusAreaHostAura::StatusAreaHostAura()
|
| @@ -28,13 +27,6 @@
|
| status_area_view_(NULL) {
|
| }
|
|
|
| -StatusAreaHostAura::~StatusAreaHostAura() {
|
| -}
|
| -
|
| -const views::View* StatusAreaHostAura::GetStatusArea() const {
|
| - return status_area_view_;
|
| -}
|
| -
|
| views::Widget* StatusAreaHostAura::CreateStatusArea() {
|
| aura_shell::Shell* aura_shell = aura_shell::Shell::GetInstance();
|
| aura::Window* status_window = aura_shell->GetContainer(
|
| @@ -45,12 +37,8 @@
|
|
|
| // Add child buttons.
|
| #if defined(OS_CHROMEOS)
|
| - ClockMenuButton* clock = NULL;
|
| chromeos::StatusAreaViewChromeos::AddChromeosButtons(
|
| - status_area_view_, this, chromeos::StatusAreaViewChromeos::BROWSER_MODE,
|
| - &clock);
|
| - DCHECK(clock);
|
| - timezone_clock_updater_.reset(new TimezoneClockUpdater(clock));
|
| + status_area_view_, this, chromeos::StatusAreaViewChromeos::BROWSER_MODE);
|
| #else
|
| const bool border = true;
|
| const bool no_border = false;
|
|
|