chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc - Issue 8437002: Move BrowserThread to content namespace.

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: A few updates. Created 9 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "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 18 matching lines...) Expand all Loading...
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 "views/controls/button/menu_button.h"	31 #include "views/controls/button/menu_button.h"

32 #include "views/controls/button/text_button.h"	32 #include "views/controls/button/text_button.h"

33 #include "views/controls/menu/menu_controller.h"	33 #include "views/controls/menu/menu_controller.h"

34 #include "views/controls/menu/menu_item_view.h"	34 #include "views/controls/menu/menu_item_view.h"

35 #include "views/controls/menu/submenu_view.h"	35 #include "views/controls/menu/submenu_view.h"

36 #include "views/views_delegate.h"	36 #include "views/views_delegate.h"

37 #include "views/widget/widget.h"	37 #include "views/widget/widget.h"

38	38

	39 using content::BrowserThread;

	40

39 #if defined(OS_LINUX)	41 #if defined(OS_LINUX)

40 // See http://crbug.com/40040 for details.	42 // See http://crbug.com/40040 for details.

41 #define MAYBE_DND DISABLED_DND	43 #define MAYBE_DND DISABLED_DND

42 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu	44 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu

43 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu	45 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu

44	46

45 // See http://crbug.com/40039 for details.	47 // See http://crbug.com/40039 for details.

46 #define MAYBE_KeyEvents DISABLED_KeyEvents	48 #define MAYBE_KeyEvents DISABLED_KeyEvents

47	49

48 // Two bugs here. http://crbug.com/47089 for general Linux Views, and	50 // Two bugs here. http://crbug.com/47089 for general Linux Views, and

(...skipping 1528 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1577 ASSERT_TRUE(menu != NULL);	1579 ASSERT_TRUE(menu != NULL);

1578 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());	1580 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());

1579	1581

1580 menu->GetMenuController()->CancelAll();	1582 menu->GetMenuController()->CancelAll();

1581	1583

1582 Done();	1584 Done();

1583 }	1585 }

1584 };	1586 };

1585	1587

1586 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)	1588 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)

OLD	NEW