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

Unified Diff: ash/system/status_area_widget.h

Issue 10909220: Removes caching of whether the launcher should be visible from (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: auto-hide Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/status_area_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.h
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index 99fac74c69994c13e84f4869d06df4012a8a27e6..4a5e600c7400d51651ba22dc4d741641f266e1fa 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -56,11 +56,6 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
// notification tray.
void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
- // Called whenever the launcher auto-hide behavior may need updating.
- // This sets should_show_launcher_ and calls
- // ShelfLayoutManager::UpdateAutoHideState() if the state has changed.
- void UpdateShouldShowLauncher();
-
internal::StatusAreaWidgetDelegate* status_area_widget_delegate() {
return status_area_widget_delegate_;
}
@@ -74,7 +69,10 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
user::LoginStatus login_status() const { return login_status_; }
- bool should_show_launcher() const { return should_show_launcher_; }
+ // Returns true if the launcher should be visible. This is used when the
+ // launcher is configured to auto-hide and test if the shelf should force
+ // the launcher to remain visible.
+ bool ShouldShowLauncher() const;
private:
void AddSystemTray(ShellDelegate* shell_delegate);
@@ -86,7 +84,6 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
SystemTray* system_tray_;
WebNotificationTray* web_notification_tray_;
user::LoginStatus login_status_;
- bool should_show_launcher_;
DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
};
« no previous file with comments | « no previous file | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698