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

Side by Side Diff: chrome/browser/chromeos/status/status_area_bubble.h

Issue 8511004: Fix to correctly set accessible state of StatusAreaBubbleContentView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « no previous file | chrome/browser/chromeos/status/status_area_bubble.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUBBLE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUBBLE_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUBBLE_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUBBLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/timer.h" 9 #include "base/timer.h"
10 #include "chrome/browser/ui/views/bubble/bubble.h" 10 #include "chrome/browser/ui/views/bubble/bubble.h"
(...skipping 12 matching lines...) Expand all
23 public: 23 public:
24 // |icon_view| is used to show icon, |this| will take its ownership. 24 // |icon_view| is used to show icon, |this| will take its ownership.
25 StatusAreaBubbleContentView(views::View* icon_view, const string16& message); 25 StatusAreaBubbleContentView(views::View* icon_view, const string16& message);
26 virtual ~StatusAreaBubbleContentView(); 26 virtual ~StatusAreaBubbleContentView();
27 27
28 string16 GetMessage() const; 28 string16 GetMessage() const;
29 void SetMessage(const string16& message); 29 void SetMessage(const string16& message);
30 30
31 views::View* icon_view() const { return icon_view_; } 31 views::View* icon_view() const { return icon_view_; }
32 32
33 // views::View override
34 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
35
33 private: 36 private:
34 views::View* icon_view_; 37 views::View* icon_view_;
35 views::Label* message_view_; 38 views::Label* message_view_;
36 39
37 DISALLOW_COPY_AND_ASSIGN(StatusAreaBubbleContentView); 40 DISALLOW_COPY_AND_ASSIGN(StatusAreaBubbleContentView);
38 }; 41 };
39 42
40 // StatusAreaBubbleController is used to show a bubble under the status area 43 // StatusAreaBubbleController is used to show a bubble under the status area
41 class StatusAreaBubbleController : public BubbleDelegate { 44 class StatusAreaBubbleController : public BubbleDelegate {
42 public: 45 public:
(...skipping 19 matching lines...) Expand all
62 StatusAreaBubbleContentView* content_; 65 StatusAreaBubbleContentView* content_;
63 // A timer to hide this bubble. 66 // A timer to hide this bubble.
64 base::OneShotTimer<StatusAreaBubbleController> timer_; 67 base::OneShotTimer<StatusAreaBubbleController> timer_;
65 68
66 DISALLOW_COPY_AND_ASSIGN(StatusAreaBubbleController); 69 DISALLOW_COPY_AND_ASSIGN(StatusAreaBubbleController);
67 }; 70 };
68 71
69 } // namespace chromeos 72 } // namespace chromeos
70 73
71 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUBBLE_H_ 74 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUBBLE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/status_area_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698