diff options
author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 10:37:31 +0000 |
---|---|---|
committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 10:37:31 +0000 |
commit | df1c986efabe7322872eff0820c399487972a695 (patch) | |
tree | ce157a4438cfa0c5b39869bf6e729c61f580d90c /ash/status_area | |
parent | 2e0ccb3e677a73674f4e55d4af306bf09c620b62 (diff) | |
download | chromium_src-df1c986efabe7322872eff0820c399487972a695.zip chromium_src-df1c986efabe7322872eff0820c399487972a695.tar.gz chromium_src-df1c986efabe7322872eff0820c399487972a695.tar.bz2 |
Add a unit test for the focus cycler.
BUG=None
TEST=Run aura_shell_unittest
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=121685
Review URL: https://chromiumcodereview.appspot.com/9317027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/status_area')
-rw-r--r-- | ash/status_area/status_area_view.cc | 8 | ||||
-rw-r--r-- | ash/status_area/status_area_view.h | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ash/status_area/status_area_view.cc b/ash/status_area/status_area_view.cc index 212a4cb..8bcdfb1 100644 --- a/ash/status_area/status_area_view.cc +++ b/ash/status_area/status_area_view.cc @@ -28,6 +28,14 @@ gfx::Size StatusAreaView::GetPreferredSize() { return gfx::Size(status_mock_.width(), status_mock_.height()); } +views::Widget* StatusAreaView::GetWidget() { + return View::GetWidget(); +} + +const views::Widget* StatusAreaView::GetWidget() const { + return View::GetWidget(); +} + void StatusAreaView::OnPaint(gfx::Canvas* canvas) { canvas->DrawBitmapInt(status_mock_, 0, 0); } diff --git a/ash/status_area/status_area_view.h b/ash/status_area/status_area_view.h index e7788a1..32d9f37 100644 --- a/ash/status_area/status_area_view.h +++ b/ash/status_area/status_area_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -7,18 +7,22 @@ #pragma once #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 StatusAreaView : public views::WidgetDelegateView { +class StatusAreaView : public views::WidgetDelegate, + public views::AccessiblePaneView { public: StatusAreaView(); virtual ~StatusAreaView(); // Overridden from views::View: virtual gfx::Size GetPreferredSize() OVERRIDE; + virtual views::Widget* GetWidget() OVERRIDE; + virtual const views::Widget* GetWidget() const OVERRIDE; private: virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |