Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1770)

Unified Diff: ash/status_area/status_area_view.h

Issue 10202012: Revert 133691 because it accidentally reverted revs 133686 and 133684. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/status_area/status_area_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/status_area/status_area_view.h
===================================================================
--- ash/status_area/status_area_view.h (revision 133697)
+++ ash/status_area/status_area_view.h (working copy)
@@ -1,49 +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.
-
-#ifndef ASH_STATUS_AREA_STATUS_AREA_VIEW_H_
-#define ASH_STATUS_AREA_STATUS_AREA_VIEW_H_
-#pragma once
-
-#include "ash/ash_export.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/views/accessible_pane_view.h"
-#include "ui/views/widget/widget_delegate.h"
-
-namespace ash {
-namespace internal {
-
-class FocusCycler;
-
-class ASH_EXPORT StatusAreaView : public views::WidgetDelegate,
- public views::AccessiblePaneView {
- public:
- StatusAreaView();
- virtual ~StatusAreaView();
-
- // Sets the focus cycler.
- void SetFocusCyclerForTesting(const FocusCycler* focus_cycler);
-
- // Overridden from views::AccessiblePaneView.
- virtual View* GetDefaultFocusableChild() OVERRIDE;
-
- // Overridden from views::View:
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
- virtual views::Widget* GetWidget() OVERRIDE;
- virtual const views::Widget* GetWidget() const OVERRIDE;
-
- // views::WidgetDelegate overrides:
- virtual bool CanActivate() const OVERRIDE;
- virtual void DeleteDelegate() OVERRIDE;
-
- private:
- const FocusCycler* focus_cycler_for_testing_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusAreaView);
-};
-
-} // namespace internal
-} // namespace ash
-
-#endif // ASH_STATUS_AREA_STATUS_AREA_VIEW_H_
« no previous file with comments | « ash/shell.cc ('k') | ash/status_area/status_area_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698