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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

Issue 2267183002: ash: Remove unnecessary utility methods from ash::Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 4 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
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
index 4af3bfbee8d138e82ac395ab4d235814999cf608..28e70d80e697d054b64ce627d83913198bc66efb 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -17,6 +17,7 @@
#include "ash/common/wm_shell.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_util.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/test/shelf_test_api.h"
#include "ash/test/shelf_view_test_api.h"
@@ -2197,7 +2198,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, OverflowBubble) {
chrome::NewTab(browser());
// No overflow yet.
- EXPECT_FALSE(shelf_->IsShowingOverflowBubble());
+ EXPECT_FALSE(shelf_->shelf_widget()->IsShowingOverflowBubble());
ash::test::ShelfViewTestAPI test(
ash::test::ShelfTestAPI(shelf_).shelf_view());
@@ -2213,13 +2214,13 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, OverflowBubble) {
// Now show overflow bubble.
test.ShowOverflowBubble();
- EXPECT_TRUE(shelf_->IsShowingOverflowBubble());
+ EXPECT_TRUE(shelf_->shelf_widget()->IsShowingOverflowBubble());
// Unpin first pinned app and there should be no crash.
controller_->UnpinAppWithID(std::string("fake_app_0"));
test.RunMessageLoopUntilAnimationsDone();
- EXPECT_FALSE(shelf_->IsShowingOverflowBubble());
+ EXPECT_FALSE(shelf_->shelf_widget()->IsShowingOverflowBubble());
}
// Check that a windowed V1 application can navigate away from its domain, but
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698