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

Unified Diff: chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc

Issue 2229943003: Reusing Ok/Cancel buttons for intent picker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing the intent picker class to use is_null() and Reset() properly. 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
Index: chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
index f53a1cf2c0c1d1a62519137576c2ae3e4ed4bf18..370d1631de3aa0c90aa21bf097d292797f390919 100644
--- a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
+++ b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
@@ -14,7 +14,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/scroll_view.h"
#include "ui/views/resources/grit/views_resources.h"
#include "url/gurl.h"
@@ -79,9 +78,8 @@ TEST_F(IntentPickerBubbleViewTest, NullIcons) {
CreateBubbleView(false);
size_t size = bubble_->app_info_.size();
for (size_t i = 0; i < size; ++i) {
- views::LabelButton* app = bubble_->GetLabelButtonAt(i);
- EXPECT_TRUE(
- app->GetImage(views::Button::ButtonState::STATE_NORMAL).isNull()) << i;
+ gfx::ImageSkia image = bubble_->GetAppImageForTesting(i);
+ EXPECT_TRUE(image.isNull()) << i;
}
}
@@ -90,9 +88,8 @@ TEST_F(IntentPickerBubbleViewTest, NonNullIcons) {
CreateBubbleView(true);
size_t size = bubble_->app_info_.size();
for (size_t i = 0; i < size; ++i) {
- views::LabelButton* app = bubble_->GetLabelButtonAt(i);
- EXPECT_FALSE(
- app->GetImage(views::Button::ButtonState::STATE_NORMAL).isNull()) << i;
+ gfx::ImageSkia image = bubble_->GetAppImageForTesting(i);
+ EXPECT_FALSE(image.isNull()) << i;
}
}

Powered by Google App Engine
This is Rietveld 408576698