| OLD | NEW |
| 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 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/macros.h" |
| 9 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 10 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
| 11 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
| 12 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "build/build_config.h" |
| 14 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
| 15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 17 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 16 #include "chrome/browser/chrome_content_browser_client.h" | 18 #include "chrome/browser/chrome_content_browser_client.h" |
| 17 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
| 18 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
| 19 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 21 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 20 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" | 22 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" |
| 21 #include "chrome/browser/ui/browser.h" | 23 #include "chrome/browser/ui/browser.h" |
| 22 #include "chrome/browser/ui/browser_tabstrip.h" | 24 #include "chrome/browser/ui/browser_tabstrip.h" |
| 23 #include "chrome/browser/ui/browser_window.h" | 25 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 2210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2234 }; | 2236 }; |
| 2235 | 2237 |
| 2236 #if defined(USE_OZONE) | 2238 #if defined(USE_OZONE) |
| 2237 // ozone bringup - http://crbug.com/401304 | 2239 // ozone bringup - http://crbug.com/401304 |
| 2238 #define MAYBE_ContextMenusKeyboardEscape DISABLED_ContextMenusKeyboardEscape | 2240 #define MAYBE_ContextMenusKeyboardEscape DISABLED_ContextMenusKeyboardEscape |
| 2239 #else | 2241 #else |
| 2240 #define MAYBE_ContextMenusKeyboardEscape ContextMenusKeyboardEscape | 2242 #define MAYBE_ContextMenusKeyboardEscape ContextMenusKeyboardEscape |
| 2241 #endif | 2243 #endif |
| 2242 VIEW_TEST(BookmarkBarViewTest24, MAYBE_ContextMenusKeyboardEscape) | 2244 VIEW_TEST(BookmarkBarViewTest24, MAYBE_ContextMenusKeyboardEscape) |
| 2243 | 2245 |
| OLD | NEW |