OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/ui/browser_window.h" | 9 #include "chrome/browser/ui/browser_window.h" |
10 #include "chrome/browser/ui/chrome_pages.h" | 10 #include "chrome/browser/ui/chrome_pages.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 "});", | 169 "});", |
170 list_selector.c_str(), | 170 list_selector.c_str(), |
171 index); | 171 index); |
172 | 172 |
173 EXPECT_TRUE(content::ExecuteScript( | 173 EXPECT_TRUE(content::ExecuteScript( |
174 GetActiveFrame(), | 174 GetActiveFrame(), |
175 script)); | 175 script)); |
176 } | 176 } |
177 | 177 |
178 private: | 178 private: |
179 scoped_ptr<content::DOMMessageQueue> dom_message_queue_; | 179 std::unique_ptr<content::DOMMessageQueue> dom_message_queue_; |
180 | 180 |
181 DISALLOW_COPY_AND_ASSIGN(LanguageDictionaryWebUITest); | 181 DISALLOW_COPY_AND_ASSIGN(LanguageDictionaryWebUITest); |
182 }; | 182 }; |
183 | 183 |
184 } // namespace | 184 } // namespace |
185 | 185 |
186 // Test InlineEditableItemList keyboard focus behavior in editDictionary | 186 // Test InlineEditableItemList keyboard focus behavior in editDictionary |
187 // overlay. | 187 // overlay. |
188 // editDictionary overlay doesn't exist on OSX so disable it there. | 188 // editDictionary overlay doesn't exist on OSX so disable it there. |
189 #if !defined(OS_MACOSX) | 189 #if !defined(OS_MACOSX) |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 EXPECT_TRUE(ListItemSelected(list_selector, placeholder_index - 1)); | 241 EXPECT_TRUE(ListItemSelected(list_selector, placeholder_index - 1)); |
242 | 242 |
243 // Press shift+tab to go back to the list. | 243 // Press shift+tab to go back to the list. |
244 PressKey(ui::VKEY_TAB, true); | 244 PressKey(ui::VKEY_TAB, true); |
245 | 245 |
246 // Verify that the item above the placeholder is selected and has focus. | 246 // Verify that the item above the placeholder is selected and has focus. |
247 EXPECT_TRUE(ListItemSelectedAndFocused(list_selector, | 247 EXPECT_TRUE(ListItemSelectedAndFocused(list_selector, |
248 placeholder_index - 1)); | 248 placeholder_index - 1)); |
249 } | 249 } |
250 #endif // !defined(OS_MACOSX) | 250 #endif // !defined(OS_MACOSX) |
OLD | NEW |