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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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
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 #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/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
(...skipping 15 matching lines...) Expand all
26 #include "content/test/test_browser_thread.h" 26 #include "content/test/test_browser_thread.h"
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "ui/base/accessibility/accessibility_types.h" 28 #include "ui/base/accessibility/accessibility_types.h"
29 #include "ui/base/clipboard/clipboard.h" 29 #include "ui/base/clipboard/clipboard.h"
30 #include "ui/base/keycodes/keyboard_codes.h" 30 #include "ui/base/keycodes/keyboard_codes.h"
31 #include "ui/views/controls/button/menu_button.h" 31 #include "ui/views/controls/button/menu_button.h"
32 #include "ui/views/controls/button/text_button.h" 32 #include "ui/views/controls/button/text_button.h"
33 #include "ui/views/controls/menu/menu_controller.h" 33 #include "ui/views/controls/menu/menu_controller.h"
34 #include "ui/views/controls/menu/menu_item_view.h" 34 #include "ui/views/controls/menu/menu_item_view.h"
35 #include "ui/views/controls/menu/submenu_view.h" 35 #include "ui/views/controls/menu/submenu_view.h"
36 #include "ui/views/views_delegate.h"
36 #include "ui/views/widget/widget.h" 37 #include "ui/views/widget/widget.h"
37 #include "views/views_delegate.h"
38 38
39 using content::BrowserThread; 39 using content::BrowserThread;
40 40
41 #if defined(OS_LINUX) 41 #if defined(OS_LINUX)
42 // See http://crbug.com/40040 for details. 42 // See http://crbug.com/40040 for details.
43 #define MAYBE_DND DISABLED_DND 43 #define MAYBE_DND DISABLED_DND
44 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu 44 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu
45 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu 45 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu
46 46
47 // See http://crbug.com/40039 for details. 47 // See http://crbug.com/40039 for details.
(...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 ASSERT_TRUE(menu != NULL); 1578 ASSERT_TRUE(menu != NULL);
1579 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); 1579 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
1580 1580
1581 menu->GetMenuController()->CancelAll(); 1581 menu->GetMenuController()->CancelAll();
1582 1582
1583 Done(); 1583 Done();
1584 } 1584 }
1585 }; 1585 };
1586 1586
1587 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) 1587 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698