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

Unified Diff: chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc

Issue 256443004: Revert of Moves the notification icon out of the status area overflow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « chrome/browser/ui/views/status_icons/status_tray_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
index d302690acfaf55f94ad90a876e83d9b623a7d838..5502430a26824b4eaf4b3ce86bf009bb8bf98bf0 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
@@ -15,29 +15,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"
-
-class FakeStatusTrayStateChangerProxy : public StatusTrayStateChangerProxy {
- public:
- FakeStatusTrayStateChangerProxy()
- : enqueue_called_(false), icon_id_(0), window_(NULL) {}
-
- virtual void EnqueueChange(UINT icon_id, HWND window) {
- enqueue_called_ = true;
- icon_id_ = icon_id;
- window_ = window;
- }
-
- bool enqueue_called() { return enqueue_called_; }
- UINT icon_id() { return icon_id_; }
- HWND window() { return window_; }
-
- private:
- bool enqueue_called_;
- UINT icon_id_;
- HWND window_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeStatusTrayStateChangerProxy);
-};
class FakeStatusIconObserver : public StatusIconObserver {
public:
@@ -127,21 +104,3 @@
tray.WndProc(NULL, message_id, icon_id, WM_LBUTTONDOWN);
}
#endif // !defined(USE_AURA)
-
-TEST(StatusTrayWinTest, EnsureVisibleTest) {
- StatusTrayWin tray;
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
-
- FakeStatusTrayStateChangerProxy* proxy =
- new FakeStatusTrayStateChangerProxy();
- tray.SetStatusTrayStateChangerProxyForTest(make_scoped_ptr(proxy));
-
- StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
- StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
-
- icon->ForceVisible();
- EXPECT_TRUE(proxy->enqueue_called());
- EXPECT_EQ(proxy->window(), icon->window());
- EXPECT_EQ(proxy->icon_id(), icon->icon_id());
-}
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698