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

Unified Diff: ash/common/frame/custom_frame_view_ash_unittest.cc

Issue 2678353005: Remove pre-MD code related to tray/menu user profiles. (Closed)
Patch Set: back out a11y changes and rebase Created 3 years, 10 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/ash_strings.grd ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/frame/custom_frame_view_ash_unittest.cc
diff --git a/ash/common/frame/custom_frame_view_ash_unittest.cc b/ash/common/frame/custom_frame_view_ash_unittest.cc
index f677e356099328faf7dee732fd2b7258aa498495..b5729ef394f1f4fd3cf4a9cd5cfe7ceb373e1872 100644
--- a/ash/common/frame/custom_frame_view_ash_unittest.cc
+++ b/ash/common/frame/custom_frame_view_ash_unittest.cc
@@ -13,10 +13,9 @@
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/test/ash_test_base.h"
-#include "grit/ash_resources.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_unittest_util.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -188,10 +187,8 @@ TEST_F(CustomFrameViewAshTest, AvatarIcon) {
EXPECT_FALSE(custom_frame_view->GetAvatarIconViewForTest());
// Avatar image becomes available.
- const gfx::ImageSkia user_image =
- *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_AURA_UBER_TRAY_GUEST_ICON);
- GetTestSessionStateDelegate()->SetUserImage(user_image);
+ GetTestSessionStateDelegate()->SetUserImage(
+ gfx::test::CreateImage(27, 27).AsImageSkia());
widget->Hide();
widget->Show();
EXPECT_TRUE(custom_frame_view->GetAvatarIconViewForTest());
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698