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

Side by Side Diff: chrome/browser/chromeos/status/status_area_view.cc

Issue 8743014: [cros, Aura] Refresh status area widget bounds on StatusAreaView layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit fixes, merge, prevent double deletion of ShelfLayoutManager 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
« no previous file with comments | « no previous file | ui/aura_shell/aura_shell.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/chromeos/status/status_area_view.h" 5 #include "chrome/browser/chromeos/status/status_area_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "chrome/browser/chromeos/view_ids.h" 12 #include "chrome/browser/chromeos/view_ids.h"
13 #include "ui/gfx/canvas.h" 13 #include "ui/gfx/canvas.h"
14 #include "ui/views/border.h" 14 #include "ui/views/border.h"
15 15
16 #if defined(USE_AURA)
17 #include "ui/views/widget/widget.h"
18 #endif
19
16 // Number of pixels to separate each icon. 20 // Number of pixels to separate each icon.
17 #if defined(TOUCH_UI) 21 #if defined(TOUCH_UI)
18 const int kSeparation = 25; 22 const int kSeparation = 25;
19 #else 23 #else
20 const int kSeparation = 0; 24 const int kSeparation = 0;
21 #endif 25 #endif
22 26
23 StatusAreaView::StatusAreaView() 27 StatusAreaView::StatusAreaView()
24 : need_return_focus_(false) { 28 : need_return_focus_(false) {
25 set_id(VIEW_ID_STATUS_AREA); 29 set_id(VIEW_ID_STATUS_AREA);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 89 }
86 } 90 }
87 } 91 }
88 92
89 void StatusAreaView::ChildPreferredSizeChanged(View* child) { 93 void StatusAreaView::ChildPreferredSizeChanged(View* child) {
90 // When something like the clock menu button's size changes, we need to 94 // When something like the clock menu button's size changes, we need to
91 // relayout. Also mark that this view's size has changed. This will let 95 // relayout. Also mark that this view's size has changed. This will let
92 // BrowserView know to relayout, which will reset the bounds of this view. 96 // BrowserView know to relayout, which will reset the bounds of this view.
93 Layout(); 97 Layout();
94 PreferredSizeChanged(); 98 PreferredSizeChanged();
99 #if defined(USE_AURA)
100 if (GetWidget())
101 GetWidget()->SetSize(GetPreferredSize());
102 #endif
95 } 103 }
96 104
97 void StatusAreaView::MakeButtonsActive(bool active) { 105 void StatusAreaView::MakeButtonsActive(bool active) {
98 for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin(); 106 for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin();
99 iter != buttons_.end(); ++iter) { 107 iter != buttons_.end(); ++iter) {
100 (*iter)->set_menu_active(active); 108 (*iter)->set_menu_active(active);
101 } 109 }
102 } 110 }
103 111
104 void StatusAreaView::UpdateButtonVisibility() { 112 void StatusAreaView::UpdateButtonVisibility() {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 if (need_return_focus_) { 145 if (need_return_focus_) {
138 const views::View* first = GetFirstFocusableChild(); 146 const views::View* first = GetFirstFocusableChild();
139 const views::View* last = GetLastFocusableChild(); 147 const views::View* last = GetLastFocusableChild();
140 const bool first_to_last = (focused_before == first && focused_now == last); 148 const bool first_to_last = (focused_before == first && focused_now == last);
141 const bool last_to_first = (focused_now == first && focused_before == last); 149 const bool last_to_first = (focused_now == first && focused_before == last);
142 150
143 if (first_to_last || last_to_first) 151 if (first_to_last || last_to_first)
144 ReturnFocus(first_to_last); 152 ReturnFocus(first_to_last);
145 } 153 }
146 } 154 }
OLDNEW
« no previous file with comments | « no previous file | ui/aura_shell/aura_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698