[NOT TO COMMIT] File Manager: make "date modified" column depending on the 12/24 hour setting.

ash/wm/workspace/system_background_controller.cc

Index: ash/wm/workspace/system_background_controller.cc
diff --git a/ash/wm/workspace/system_background_controller.cc b/ash/wm/workspace/system_background_controller.cc
deleted file mode 100644
index 363a3050f46171a7381815285742d34c86c17c75..0000000000000000000000000000000000000000
--- a/ash/wm/workspace/system_background_controller.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/wm/workspace/system_background_controller.h"
-
-#include "ash/shell_window_ids.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/root_window.h"
-#include "ui/gfx/canvas.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
-
-namespace ash {
-namespace internal {
-
-// View implementation responsible for rendering the background.
-class SystemBackgroundController::View : public views::WidgetDelegateView {
- public:
-  explicit View(SystemBackgroundController* controller);
-  virtual ~View();
-
-  // Closes the hosting widget.
-  void Close();
-
-  // WidgetDelegate overrides:
-  virtual views::View* GetContentsView() OVERRIDE;
-
- private:
-  SystemBackgroundController* controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(View);
-};
-
-SystemBackgroundController::View::View(SystemBackgroundController* controller)
-    : controller_(controller) {
-}
-
-SystemBackgroundController::View::~View() {
-  if (controller_)
-    controller_->view_ = NULL;
-}
-
-void SystemBackgroundController::View::Close() {
-  controller_ = NULL;
-  GetWidget()->Close();
-}
-
-views::View* SystemBackgroundController::View::GetContentsView() {
-  return this;
-}
-
-SystemBackgroundController::SystemBackgroundController(aura::RootWindow* root,
-                                                       SkColor color)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(view_(new View(this))) {
-  views::Widget* widget = new views::Widget;
-  views::Widget::InitParams params(
-      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.delegate = view_;
-  params.parent = root->GetChildById(kShellWindowId_SystemBackgroundContainer);
-  params.can_activate = false;
-  params.accept_events = false;
-  // WARNING: because of a bug using anything but a solid color here causes
-  // flicker.
-  params.layer_type = ui::LAYER_SOLID_COLOR;
-  widget->Init(params);
-  widget->GetNativeView()->SetProperty(aura::client::kAnimationsDisabledKey,
-                                       true);
-  widget->GetNativeView()->layer()->SetColor(color);
-  widget->SetBounds(params.parent->bounds());
-  widget->Show();
-  widget->GetNativeView()->SetName("SystemBackground");
-}
-
-SystemBackgroundController::~SystemBackgroundController() {
-  if (view_)
-    view_->Close();
-}
-
-void SystemBackgroundController::SetColor(SkColor color) {
-  if (view_)
-    view_->GetWidget()->GetNativeView()->layer()->SetColor(color);
-}
-
-}  // namespace internal
-}  // namespace ash