| 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/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "ui/base/test/ui_controls.h" | 42 #include "ui/base/test/ui_controls.h" |
| 43 #include "ui/events/keycodes/keyboard_codes.h" | 43 #include "ui/events/keycodes/keyboard_codes.h" |
| 44 #include "ui/views/controls/button/menu_button.h" | 44 #include "ui/views/controls/button/menu_button.h" |
| 45 #include "ui/views/controls/menu/menu_controller.h" | 45 #include "ui/views/controls/menu/menu_controller.h" |
| 46 #include "ui/views/controls/menu/menu_item_view.h" | 46 #include "ui/views/controls/menu/menu_item_view.h" |
| 47 #include "ui/views/controls/menu/submenu_view.h" | 47 #include "ui/views/controls/menu/submenu_view.h" |
| 48 #include "ui/views/widget/widget.h" | 48 #include "ui/views/widget/widget.h" |
| 49 | 49 |
| 50 using base::ASCIIToUTF16; | 50 using base::ASCIIToUTF16; |
| 51 using bookmarks::BookmarkModel; | 51 using bookmarks::BookmarkModel; |
| 52 using bookmarks::BookmarkNode; |
| 52 using content::BrowserThread; | 53 using content::BrowserThread; |
| 53 using content::OpenURLParams; | 54 using content::OpenURLParams; |
| 54 using content::PageNavigator; | 55 using content::PageNavigator; |
| 55 using content::WebContents; | 56 using content::WebContents; |
| 56 | 57 |
| 57 namespace { | 58 namespace { |
| 58 | 59 |
| 59 // Waits for a views::Widget dialog to show up. | 60 // Waits for a views::Widget dialog to show up. |
| 60 class DialogWaiter : public aura::EnvObserver, | 61 class DialogWaiter : public aura::EnvObserver, |
| 61 public views::WidgetObserver { | 62 public views::WidgetObserver { |
| (...skipping 1990 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2052 }; | 2053 }; |
| 2053 | 2054 |
| 2054 #if defined(OS_WIN) | 2055 #if defined(OS_WIN) |
| 2055 // This test times out on Windows. TODO(pkotwicz): Find out why. | 2056 // This test times out on Windows. TODO(pkotwicz): Find out why. |
| 2056 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag | 2057 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag |
| 2057 #else | 2058 #else |
| 2058 #define MAYBE_CloseSourceBrowserDuringDrag CloseSourceBrowserDuringDrag | 2059 #define MAYBE_CloseSourceBrowserDuringDrag CloseSourceBrowserDuringDrag |
| 2059 #endif | 2060 #endif |
| 2060 | 2061 |
| 2061 VIEW_TEST(BookmarkBarViewTest22, MAYBE_CloseSourceBrowserDuringDrag) | 2062 VIEW_TEST(BookmarkBarViewTest22, MAYBE_CloseSourceBrowserDuringDrag) |
| OLD | NEW |