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

Side by Side 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 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/browser/chromeos/status/status_area_button.h" 10 #include "chrome/browser/chromeos/status/status_area_button.h"
11 11
12 #if defined(OS_CHROMEOS)
13 #include "base/memory/scoped_ptr.h"
14 #include "chrome/browser/chromeos/login/login_html_dialog.h"
15 #endif
16
12 class StatusAreaView; 17 class StatusAreaView;
13 class TimezoneClockUpdater; 18 class TimezoneClockUpdater;
14 19
15 namespace views { 20 namespace views {
16 class Views; 21 class Views;
17 class Widget; 22 class Widget;
18 } 23 }
19 24
20 class StatusAreaHostAura : public StatusAreaButton::Delegate { 25 class StatusAreaHostAura : public StatusAreaButton::Delegate {
21 public: 26 public:
(...skipping 17 matching lines...) Expand all
39 virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE; 44 virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE;
40 virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE; 45 virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
41 46
42 private: 47 private:
43 // Owned by caller of CreateStatusArea(). 48 // Owned by caller of CreateStatusArea().
44 views::Widget* status_area_widget_; 49 views::Widget* status_area_widget_;
45 // Owned by status_area_widget_. 50 // Owned by status_area_widget_.
46 StatusAreaView* status_area_view_; 51 StatusAreaView* status_area_view_;
47 52
48 #if defined(OS_CHROMEOS) 53 #if defined(OS_CHROMEOS)
54 // Proxy settings dialog that can be invoked from network menu.
55 scoped_ptr<chromeos::LoginHtmlDialog> proxy_settings_dialog_;
56
49 scoped_ptr<TimezoneClockUpdater> timezone_clock_updater_; 57 scoped_ptr<TimezoneClockUpdater> timezone_clock_updater_;
50 #endif 58 #endif
51 59
52 DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura); 60 DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura);
53 }; 61 };
54 62
55 #endif // CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_ 63 #endif // CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_
OLDNEW
« 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