OLD | NEW |
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 #include <string> | 5 #include <string> |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/extensions/extension_accessibility_api.h" | 10 #include "chrome/browser/extensions/extension_accessibility_api.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 public: | 29 public: |
30 AccessibilityViewsDelegate() {} | 30 AccessibilityViewsDelegate() {} |
31 virtual ~AccessibilityViewsDelegate() {} | 31 virtual ~AccessibilityViewsDelegate() {} |
32 | 32 |
33 // Overridden from views::ViewsDelegate: | 33 // Overridden from views::ViewsDelegate: |
34 virtual ui::Clipboard* GetClipboard() const OVERRIDE { return NULL; } | 34 virtual ui::Clipboard* GetClipboard() const OVERRIDE { return NULL; } |
35 virtual views::View* GetDefaultParentView() OVERRIDE { return NULL; } | 35 virtual views::View* GetDefaultParentView() OVERRIDE { return NULL; } |
36 virtual void SaveWindowPlacement(const views::Widget* window, | 36 virtual void SaveWindowPlacement(const views::Widget* window, |
37 const std::wstring& window_name, | 37 const std::wstring& window_name, |
38 const gfx::Rect& bounds, | 38 const gfx::Rect& bounds, |
39 bool maximized) OVERRIDE { | 39 ui::WindowShowState show_state) OVERRIDE { |
40 } | 40 } |
41 virtual bool GetSavedWindowBounds(const std::wstring& window_name, | 41 virtual bool GetSavedWindowBounds(const std::wstring& window_name, |
42 gfx::Rect* bounds) const OVERRIDE { | 42 gfx::Rect* bounds) const OVERRIDE { |
43 return false; | 43 return false; |
44 } | 44 } |
45 virtual bool GetSavedMaximizedState(const std::wstring& window_name, | 45 virtual bool GetSavedWindowShowState( |
46 bool* maximized) const OVERRIDE { | 46 const std::wstring& window_name, |
| 47 ui::WindowShowState* show_state) const OVERRIDE { |
47 return false; | 48 return false; |
48 } | 49 } |
49 virtual void NotifyAccessibilityEvent( | 50 virtual void NotifyAccessibilityEvent( |
50 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE { | 51 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE { |
51 AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent( | 52 AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent( |
52 view, event_type); | 53 view, event_type); |
53 } | 54 } |
54 virtual void NotifyMenuItemFocused( | 55 virtual void NotifyMenuItemFocused( |
55 const std::wstring& menu_name, | 56 const std::wstring& menu_name, |
56 const std::wstring& menu_item_name, | 57 const std::wstring& menu_item_name, |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 EXPECT_EQ(2, focus_event_count_); | 186 EXPECT_EQ(2, focus_event_count_); |
186 EXPECT_EQ(kButton3NewASCII, last_control_name_); | 187 EXPECT_EQ(kButton3NewASCII, last_control_name_); |
187 | 188 |
188 // Advance to button 1 and check the notification. | 189 // Advance to button 1 and check the notification. |
189 focus_manager->AdvanceFocus(false); | 190 focus_manager->AdvanceFocus(false); |
190 EXPECT_EQ(3, focus_event_count_); | 191 EXPECT_EQ(3, focus_event_count_); |
191 EXPECT_EQ(kButton1ASCII, last_control_name_); | 192 EXPECT_EQ(kButton1ASCII, last_control_name_); |
192 } | 193 } |
193 | 194 |
194 #endif // defined(TOOLKIT_VIEWS) | 195 #endif // defined(TOOLKIT_VIEWS) |
OLD | NEW |