chrome/browser/ui/views/aura/status_area_host_aura.cc - Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views.

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

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/aura/app_list_window.cc ('k') | chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"	5 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "chrome/browser/chromeos/status/clock_menu_button.h"

9 #include "chrome/browser/chromeos/status/memory_menu_button.h"

10 #include "chrome/browser/chromeos/status/status_area_view.h"

11 #include "chrome/browser/profiles/profile_manager.h"	8 #include "chrome/browser/profiles/profile_manager.h"

12 #include "chrome/browser/ui/browser_list.h"	9 #include "chrome/browser/ui/browser_list.h"

13 #include "chrome/browser/ui/view_ids.h"	10 #include "chrome/browser/ui/view_ids.h"

14 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"	11 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"

	12 #include "chrome/browser/chromeos/status/clock_menu_button.h"

	13 #include "chrome/browser/chromeos/status/memory_menu_button.h"

	14 #include "chrome/browser/chromeos/status/status_area_view.h"

15 #include "chrome/common/chrome_switches.h"	15 #include "chrome/common/chrome_switches.h"

16 #include "ui/aura/window.h"	16 #include "ui/aura/window.h"

17 #include "ui/aura_shell/shell.h"	17 #include "ui/aura_shell/shell.h"

18 #include "ui/aura_shell/shell_window_ids.h"	18 #include "ui/aura_shell/shell_window_ids.h"

19 #include "ui/views/widget/widget.h"	19 #include "views/widget/widget.h"

20	20

21 #if defined(OS_CHROMEOS)	21 #if defined(OS_CHROMEOS)

22 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"	22 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"

23 #include "chrome/browser/chromeos/status/timezone_clock_updater.h"	23 #include "chrome/browser/chromeos/status/timezone_clock_updater.h"

24 #endif	24 #endif

25	25

26 StatusAreaHostAura::StatusAreaHostAura()	26 StatusAreaHostAura::StatusAreaHostAura()

27 : status_area_widget_(NULL),	27 : status_area_widget_(NULL),

28 status_area_view_(NULL) {	28 status_area_view_(NULL) {

29 }	29 }

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
114 }	114 }

115	115

116 StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const {	116 StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const {

117 return StatusAreaButton::WHITE_HALOED;	117 return StatusAreaButton::WHITE_HALOED;

118 }	118 }

119	119

120 void StatusAreaHostAura::ButtonVisibilityChanged(views::View* button_view) {	120 void StatusAreaHostAura::ButtonVisibilityChanged(views::View* button_view) {

121 if (status_area_view_)	121 if (status_area_view_)

122 status_area_view_->UpdateButtonVisibility();	122 status_area_view_->UpdateButtonVisibility();

123 }	123 }

OLD	NEW