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

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

Issue 7792030: Fix to make status area buttons activate/deactivate correctly (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 3 months 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
« no previous file with comments | « no previous file | no next file » | 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/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/chromeos/status/accessibility_menu_button.h" 10 #include "chrome/browser/chromeos/status/accessibility_menu_button.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 // When something like the clock menu button's size changes, we need to 112 // When something like the clock menu button's size changes, we need to
113 // relayout. Also mark that this view's size has changed. This will let 113 // relayout. Also mark that this view's size has changed. This will let
114 // BrowserView know to relayout, which will reset the bounds of this view. 114 // BrowserView know to relayout, which will reset the bounds of this view.
115 Layout(); 115 Layout();
116 PreferredSizeChanged(); 116 PreferredSizeChanged();
117 } 117 }
118 118
119 void StatusAreaView::MakeButtonsActive(bool active) { 119 void StatusAreaView::MakeButtonsActive(bool active) {
120 if (memory_view_) 120 if (memory_view_)
121 memory_view_->set_active(active); 121 memory_view_->set_active(active);
122 accessibility_view()->set_active(active);
123 caps_lock_view()->set_active(active);
122 clock_view()->set_active(active); 124 clock_view()->set_active(active);
123 input_method_view()->set_active(active); 125 input_method_view()->set_active(active);
124 network_view()->set_active(active); 126 network_view()->set_active(active);
125 power_view()->set_active(active); 127 power_view()->set_active(active);
126 } 128 }
127 129
128 void StatusAreaView::ButtonVisibilityChanged(views::View* button_view) { 130 void StatusAreaView::ButtonVisibilityChanged(views::View* button_view) {
129 Layout(); 131 Layout();
130 PreferredSizeChanged(); 132 PreferredSizeChanged();
131 } 133 }
132 134
133 } // namespace chromeos 135 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698