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

Side by Side Diff: chrome/browser/background/background_mode_manager_unittest.cc

Issue 464163003: Remove IDR_STATUS_TRAY_ICON_PRESSED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated the comment Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/background/background_mode_manager.h" 9 #include "chrome/browser/background/background_mode_manager.h"
10 #include "chrome/browser/browser_shutdown.h" 10 #include "chrome/browser/browser_shutdown.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 bool launch_on_startup_; 69 bool launch_on_startup_;
70 bool has_shown_balloon_; 70 bool has_shown_balloon_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(SimpleTestBackgroundModeManager); 72 DISALLOW_COPY_AND_ASSIGN(SimpleTestBackgroundModeManager);
73 }; 73 };
74 74
75 class TestStatusIcon : public StatusIcon { 75 class TestStatusIcon : public StatusIcon {
76 public: 76 public:
77 TestStatusIcon() {} 77 TestStatusIcon() {}
78 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE {} 78 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE {}
79 virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE {}
80 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE {} 79 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE {}
81 virtual void DisplayBalloon(const gfx::ImageSkia& icon, 80 virtual void DisplayBalloon(const gfx::ImageSkia& icon,
82 const base::string16& title, 81 const base::string16& title,
83 const base::string16& contents) OVERRIDE {} 82 const base::string16& contents) OVERRIDE {}
84 virtual void UpdatePlatformContextMenu( 83 virtual void UpdatePlatformContextMenu(
85 StatusIconMenuModel* menu) OVERRIDE {} 84 StatusIconMenuModel* menu) OVERRIDE {}
86 85
87 private: 86 private:
88 DISALLOW_COPY_AND_ASSIGN(TestStatusIcon); 87 DISALLOW_COPY_AND_ASSIGN(TestStatusIcon);
89 }; 88 };
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 // Installing an ephemeral app should not show the balloon. 877 // Installing an ephemeral app should not show the balloon.
879 manager_->SetHasShownBalloon(false); 878 manager_->SetHasShownBalloon(false);
880 AddEphemeralApp(ephemeral_app.get(), service); 879 AddEphemeralApp(ephemeral_app.get(), service);
881 EXPECT_FALSE(manager_->HasShownBalloon()); 880 EXPECT_FALSE(manager_->HasShownBalloon());
882 881
883 // Promoting the ephemeral app to a regular installed app should now show 882 // Promoting the ephemeral app to a regular installed app should now show
884 // the balloon. 883 // the balloon.
885 service->PromoteEphemeralApp(ephemeral_app.get(), false /*from sync*/); 884 service->PromoteEphemeralApp(ephemeral_app.get(), false /*from sync*/);
886 EXPECT_TRUE(manager_->HasShownBalloon()); 885 EXPECT_TRUE(manager_->HasShownBalloon());
887 } 886 }
OLDNEW
« no previous file with comments | « chrome/app/theme/chromium/product_logo_22_mono_invert.png ('k') | chrome/browser/status_icons/status_icon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698