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

Side by Side Diff: chrome/browser/ui/views/aura/status_area_host_aura.h

Issue 8688003: [cros, Aura] Change status area visibility during OOBE. (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"
(...skipping 17 matching lines...) Expand all
28 virtual ~StatusAreaHostAura(); 28 virtual ~StatusAreaHostAura();
29 29
30 // Returns the view housing the status area. Exposed for testing. 30 // Returns the view housing the status area. Exposed for testing.
31 views::View* GetStatusAreaForTest(); 31 views::View* GetStatusAreaForTest();
32 32
33 // Instantiates and sets |status_area_view_|, and sets it as the contents of 33 // Instantiates and sets |status_area_view_|, and sets it as the contents of
34 // a new views::Widget |status_area_widget_| which is returned. 34 // a new views::Widget |status_area_widget_| which is returned.
35 // The caller is expected to take ownership of |status_area_widget_|. 35 // The caller is expected to take ownership of |status_area_widget_|.
36 views::Widget* CreateStatusArea(); 36 views::Widget* CreateStatusArea();
37 37
38 StatusAreaView* status_area_view() { return status_area_view_; }
39
38 // StatusAreaButton::Delegate implementation. 40 // StatusAreaButton::Delegate implementation.
39 virtual bool ShouldExecuteStatusAreaCommand( 41 virtual bool ShouldExecuteStatusAreaCommand(
40 const views::View* button_view, int command_id) const OVERRIDE; 42 const views::View* button_view, int command_id) const OVERRIDE;
41 virtual void ExecuteStatusAreaCommand( 43 virtual void ExecuteStatusAreaCommand(
42 const views::View* button_view, int command_id) OVERRIDE; 44 const views::View* button_view, int command_id) OVERRIDE;
43 virtual gfx::Font GetStatusAreaFont(const gfx::Font& font) const OVERRIDE; 45 virtual gfx::Font GetStatusAreaFont(const gfx::Font& font) const OVERRIDE;
44 virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE; 46 virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE;
45 virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE; 47 virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
46 48
47 private: 49 private:
48 // Owned by caller of CreateStatusArea(). 50 // Owned by caller of CreateStatusArea().
49 views::Widget* status_area_widget_; 51 views::Widget* status_area_widget_;
50 // Owned by status_area_widget_. 52 // Owned by status_area_widget_.
51 StatusAreaView* status_area_view_; 53 StatusAreaView* status_area_view_;
52 54
53 #if defined(OS_CHROMEOS) 55 #if defined(OS_CHROMEOS)
54 // Proxy settings dialog that can be invoked from network menu. 56 // Proxy settings dialog that can be invoked from network menu.
55 scoped_ptr<chromeos::LoginHtmlDialog> proxy_settings_dialog_; 57 scoped_ptr<chromeos::LoginHtmlDialog> proxy_settings_dialog_;
56 58
57 scoped_ptr<TimezoneClockUpdater> timezone_clock_updater_; 59 scoped_ptr<TimezoneClockUpdater> timezone_clock_updater_;
58 #endif 60 #endif
59 61
60 DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura); 62 DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura);
61 }; 63 };
62 64
63 #endif // CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_AURA_STATUS_AREA_HOST_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698