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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc

Issue 661493004: Add infrastructure for Chrome Actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/views/toolbar/browser_actions_container.cc ('K') | « chrome/browser/ui/views/toolbar/browser_actions_container.cc ('k') | chrome/browser/ui/views/toolbar/chevron_menu_button.cc » ('j') | chrome/browser/ui/views/toolbar/chrome_actions_registry.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
index 5b32f1a7362a4ad097b7847dd689471589010758..9b57ebadff8c7ae928d222e0538ef1c5dadf5c7e 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
@@ -241,12 +241,12 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, MultipleWindows) {
// is right now A B C.
EXPECT_EQ(3u, first->VisibleBrowserActions());
EXPECT_EQ(3u, second->VisibleBrowserActions());
- EXPECT_EQ(extension_a(), first->GetBrowserActionViewAt(0u)->extension());
- EXPECT_EQ(extension_a(), second->GetBrowserActionViewAt(0u)->extension());
- EXPECT_EQ(extension_b(), first->GetBrowserActionViewAt(1u)->extension());
- EXPECT_EQ(extension_b(), second->GetBrowserActionViewAt(1u)->extension());
- EXPECT_EQ(extension_c(), first->GetBrowserActionViewAt(2u)->extension());
- EXPECT_EQ(extension_c(), second->GetBrowserActionViewAt(2u)->extension());
+ EXPECT_EQ(extension_a(), first->GetExtensionAt(0u));
+ EXPECT_EQ(extension_a(), second->GetExtensionAt(0u));
+ EXPECT_EQ(extension_b(), first->GetExtensionAt(1u));
+ EXPECT_EQ(extension_b(), second->GetExtensionAt(1u));
+ EXPECT_EQ(extension_c(), first->GetExtensionAt(2u));
+ EXPECT_EQ(extension_c(), second->GetExtensionAt(2u));
// Simulate a drag and drop to the right.
ui::OSExchangeData drop_data;
@@ -265,12 +265,12 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, MultipleWindows) {
// The new order, B A C, should be reflected in *both* containers, even
// though the drag only happened in the first one.
- EXPECT_EQ(extension_b(), first->GetBrowserActionViewAt(0u)->extension());
- EXPECT_EQ(extension_b(), second->GetBrowserActionViewAt(0u)->extension());
- EXPECT_EQ(extension_a(), first->GetBrowserActionViewAt(1u)->extension());
- EXPECT_EQ(extension_a(), second->GetBrowserActionViewAt(1u)->extension());
- EXPECT_EQ(extension_c(), first->GetBrowserActionViewAt(2u)->extension());
- EXPECT_EQ(extension_c(), second->GetBrowserActionViewAt(2u)->extension());
+ EXPECT_EQ(extension_b(), first->GetExtensionAt(0u));
+ EXPECT_EQ(extension_b(), second->GetExtensionAt(0u));
+ EXPECT_EQ(extension_a(), first->GetExtensionAt(1u));
+ EXPECT_EQ(extension_a(), second->GetExtensionAt(1u));
+ EXPECT_EQ(extension_c(), first->GetExtensionAt(2u));
+ EXPECT_EQ(extension_c(), second->GetExtensionAt(2u));
// Next, simulate a resize by shrinking the container.
first->OnResize(1, true);
@@ -399,8 +399,7 @@ bool BrowserActionsContainerOverflowTest::ViewOrdersMatch() {
overflow_bar_->num_browser_actions())
return false;
for (size_t i = 0; i < main_bar_->num_browser_actions(); ++i) {
- if (main_bar_->GetBrowserActionViewAt(i)->extension() !=
- overflow_bar_->GetBrowserActionViewAt(i)->extension())
+ if (main_bar_->GetExtensionAt(i) != overflow_bar_->GetExtensionAt(i))
return false;
}
return true;
@@ -442,27 +441,27 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerOverflowTest,
// All actions are showing, and are in the installation order.
EXPECT_EQ(-1, model()->GetVisibleIconCount());
ASSERT_EQ(3u, main_bar()->num_browser_actions());
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(2u));
EXPECT_TRUE(VerifyVisibleCount(3u));
// Reduce the visible count to 2. Order should be unchanged (A B C), but
// only A and B should be visible on the main bar.
model()->SetVisibleIconCount(2u);
overflow_bar()->Layout(); // Kick.
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(2u));
EXPECT_TRUE(VerifyVisibleCount(2u));
// Move extension C to the first position. Order should now be C A B, with
// C and A visible in the main bar.
model()->MoveExtensionIcon(extension_c(), 0);
overflow_bar()->Layout(); // Kick.
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(2u));
EXPECT_TRUE(VerifyVisibleCount(2u));
// Hide action A. This results in it being sent to overflow, and reducing the
@@ -473,9 +472,9 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerOverflowTest,
extension_a()->id(),
false);
overflow_bar()->Layout(); // Kick.
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(2u));
EXPECT_TRUE(VerifyVisibleCount(1u));
}
@@ -490,9 +489,9 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerOverflowTest,
// Verify starting state is A B [C].
ASSERT_EQ(3u, main_bar()->num_browser_actions());
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(2u));
EXPECT_TRUE(VerifyVisibleCount(2u));
// Drag extension A (on the main bar) to the left of extension C (in
@@ -510,9 +509,9 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerOverflowTest,
overflow_bar()->Layout();
// Order should now be B [A C].
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(2u));
VerifyVisibleCount(1u);
// Drag extension A back from overflow to the main bar.
@@ -528,9 +527,9 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerOverflowTest,
main_bar()->OnPerformDrop(target_event2);
// Order should be A B [C] again.
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(2u));
VerifyVisibleCount(2u);
// Drag extension C from overflow to the main bar (before extension B).
@@ -545,8 +544,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerOverflowTest,
main_bar()->OnPerformDrop(target_event3);
// Order should be A C B, and there should be no extensions in overflow.
- EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
- EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(1)->extension());
- EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(2)->extension());
+ EXPECT_EQ(extension_a(), main_bar()->GetExtensionAt(0u));
+ EXPECT_EQ(extension_c(), main_bar()->GetExtensionAt(1u));
+ EXPECT_EQ(extension_b(), main_bar()->GetExtensionAt(2u));
VerifyVisibleCount(3u);
}
« chrome/browser/ui/views/toolbar/browser_actions_container.cc ('K') | « chrome/browser/ui/views/toolbar/browser_actions_container.cc ('k') | chrome/browser/ui/views/toolbar/chevron_menu_button.cc » ('j') | chrome/browser/ui/views/toolbar/chrome_actions_registry.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698