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

Side by Side Diff: ash/status_area/status_area_view.h

Issue 9570013: Activate the status area only when it's focused using the keyboard (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix new FocusCycler tests Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/shell.h ('k') | ash/status_area/status_area_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ 5 #ifndef ASH_STATUS_AREA_STATUS_AREA_VIEW_H_
6 #define ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ 6 #define ASH_STATUS_AREA_STATUS_AREA_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "third_party/skia/include/core/SkBitmap.h" 9 #include "third_party/skia/include/core/SkBitmap.h"
10 #include "ui/views/accessible_pane_view.h" 10 #include "ui/views/accessible_pane_view.h"
11 #include "ui/views/widget/widget_delegate.h" 11 #include "ui/views/widget/widget_delegate.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace internal { 14 namespace internal {
15 15
16 class FocusCycler;
17
16 class StatusAreaView : public views::WidgetDelegate, 18 class StatusAreaView : public views::WidgetDelegate,
17 public views::AccessiblePaneView { 19 public views::AccessiblePaneView {
18 public: 20 public:
19 StatusAreaView(); 21 StatusAreaView();
20 virtual ~StatusAreaView(); 22 virtual ~StatusAreaView();
21 23
24 // Sets the focus cycler.
25 void SetFocusCyclerForTesting(const FocusCycler* focus_cycler);
26
22 // Overridden from views::View: 27 // Overridden from views::View:
23 virtual gfx::Size GetPreferredSize() OVERRIDE; 28 virtual gfx::Size GetPreferredSize() OVERRIDE;
24 virtual views::Widget* GetWidget() OVERRIDE; 29 virtual views::Widget* GetWidget() OVERRIDE;
25 virtual const views::Widget* GetWidget() const OVERRIDE; 30 virtual const views::Widget* GetWidget() const OVERRIDE;
26 31
32 // views::WidgetDelegate overrides:
33 virtual bool CanActivate() const OVERRIDE;
34
27 private: 35 private:
28 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 36 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
29 37
30 SkBitmap status_mock_; 38 SkBitmap status_mock_;
39 const FocusCycler* focus_cycler_for_testing_;
31 40
32 DISALLOW_COPY_AND_ASSIGN(StatusAreaView); 41 DISALLOW_COPY_AND_ASSIGN(StatusAreaView);
33 }; 42 };
34 43
35 } // namespace internal 44 } // namespace internal
36 } // namespace ash 45 } // namespace ash
37 46
38 #endif // ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ 47 #endif // ASH_STATUS_AREA_STATUS_AREA_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/status_area/status_area_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698