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

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

Issue 11273098: Relanding the EventTarget fixes for Aura (Ash) as the previous attempt was reverted due to interact… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « ash/wm/event_client_impl.cc ('k') | ui/aura/client/event_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 // Make sure drop was processed. 814 // Make sure drop was processed.
815 GURL final_url = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)-> 815 GURL final_url = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->
816 GetChild(1)->url(); 816 GetChild(1)->url();
817 ASSERT_TRUE(final_url == url_dragging_); 817 ASSERT_TRUE(final_url == url_dragging_);
818 Done(); 818 Done();
819 } 819 }
820 820
821 GURL url_dragging_; 821 GURL url_dragging_;
822 }; 822 };
823 823
824 #if defined(OS_WIN) 824 // TODO(ananta)
825 // This test has been disabled for AURA. Please look here for more information.
826 // http://code.google.com/p/chromium/issues/detail?id=158564&thanks=158564
827 #if defined(OS_WIN) || defined(USE_AURA)
825 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu 828 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu
826 #else 829 #else
827 #define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu 830 #define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu
828 #endif 831 #endif
829 VIEW_TEST(BookmarkBarViewTest8, MAYBE_DNDBackToOriginatingMenu) 832 VIEW_TEST(BookmarkBarViewTest8, MAYBE_DNDBackToOriginatingMenu)
830 833
831 // Moves the mouse over the scroll button and makes sure we get scrolling. 834 // Moves the mouse over the scroll button and makes sure we get scrolling.
832 class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase { 835 class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase {
833 protected: 836 protected:
834 virtual bool CreateBigMenu() { return true; } 837 virtual bool CreateBigMenu() { return true; }
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 Done(); 1654 Done();
1652 } 1655 }
1653 }; 1656 };
1654 1657
1655 #if defined(OS_WIN) 1658 #if defined(OS_WIN)
1656 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu 1659 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu
1657 #else 1660 #else
1658 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu 1661 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu
1659 #endif 1662 #endif
1660 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu) 1663 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu)
OLDNEW
« no previous file with comments | « ash/wm/event_client_impl.cc ('k') | ui/aura/client/event_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698