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

Unified Diff: chrome/browser/chromeos/status/network_menu_icon.h

Issue 10824208: Fix logic for VPN badges and network menu order (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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/chromeos/status/network_menu_icon.h
diff --git a/chrome/browser/chromeos/status/network_menu_icon.h b/chrome/browser/chromeos/status/network_menu_icon.h
index 4a6779c1fd7b854ece34ca2cca85afa83330f4e1..f3d48f38c9ac947555705d85505f4ed7d6d17426 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.h
+++ b/chrome/browser/chromeos/status/network_menu_icon.h
@@ -86,6 +86,9 @@ class NetworkMenuIcon : public ui::AnimationDelegate {
// Sets the resource color theme (e.g. light or dark icons).
void SetResourceColorTheme(ResourceColorTheme color);
+ // Returns true if the icon should be visible in a system tray.
+ bool ShouldShowIconInTray();
+
// Generates and returns the icon image. If |text| is not NULL, sets it to
// the tooltip or display text to show, based on the value of mode_.
const gfx::ImageSkia GetIconAndText(string16* text);
@@ -114,9 +117,6 @@ class NetworkMenuIcon : public ui::AnimationDelegate {
static const gfx::ImageSkia GetImage(const Network* network,
ResourceColorTheme color);
- // Returns an image representing an unconnected VPN.
- static const gfx::ImageSkia GetVpnImage();
-
// Access a specific image of the specified color theme. If index is out of
// range, an empty image will be returned.
static const gfx::ImageSkia GetImage(ImageType type,
« no previous file with comments | « chrome/browser/chromeos/cros/network_library_impl_stub.cc ('k') | chrome/browser/chromeos/status/network_menu_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698