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

Unified Diff: chrome/browser/ui/views/aura/status_area_host_aura.h

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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/ui/views/aura/status_area_host_aura.h
diff --git a/chrome/browser/ui/views/aura/status_area_host_aura.h b/chrome/browser/ui/views/aura/status_area_host_aura.h
index b5c00bcea1ad43ee7205a0fffea57429c375a12e..15642e5d6052dfd91fe158e391db68a570dd6901 100644
--- a/chrome/browser/ui/views/aura/status_area_host_aura.h
+++ b/chrome/browser/ui/views/aura/status_area_host_aura.h
@@ -9,6 +9,11 @@
#include "base/compiler_specific.h"
#include "chrome/browser/chromeos/status/status_area_button.h"
+#if defined(OS_CHROMEOS)
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/chromeos/login/login_html_dialog.h"
+#endif
+
class StatusAreaView;
class TimezoneClockUpdater;
@@ -46,6 +51,9 @@ class StatusAreaHostAura : public StatusAreaButton::Delegate {
StatusAreaView* status_area_view_;
#if defined(OS_CHROMEOS)
+ // Proxy settings dialog that can be invoked from network menu.
+ scoped_ptr<chromeos::LoginHtmlDialog> proxy_settings_dialog_;
+
scoped_ptr<TimezoneClockUpdater> timezone_clock_updater_;
#endif
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view_chromeos.cc ('k') | chrome/browser/ui/views/aura/status_area_host_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698