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

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

Issue 8509027: Add status area to Aura builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move status area view ids back to chromeos 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
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 "chrome/browser/chromeos/status/accessibility_menu_button.h" 11 #include "base/message_loop.h"
12 #include "chrome/browser/chromeos/status/caps_lock_menu_button.h"
13 #include "chrome/browser/chromeos/status/clock_menu_button.h"
14 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
15 #include "chrome/browser/chromeos/status/memory_menu_button.h"
16 #include "chrome/browser/chromeos/status/network_menu_button.h"
17 #include "chrome/browser/chromeos/status/power_menu_button.h"
18 #include "chrome/common/chrome_switches.h"
19 #include "grit/theme_resources.h"
20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
22 #include "views/border.h" 13 #include "views/border.h"
23 #include "views/controls/image_view.h"
24 14
25 // Number of pixels to separate each icon. 15 // Number of pixels to separate each icon.
26 #if defined(TOUCH_UI) 16 #if defined(TOUCH_UI)
27 const int kSeparation = 25; 17 const int kSeparation = 25;
28 #else 18 #else
29 const int kSeparation = 0; 19 const int kSeparation = 0;
30 #endif 20 #endif
31 21
32 StatusAreaView::StatusAreaView() 22 StatusAreaView::StatusAreaView()
33 : need_return_focus_(false) { 23 : need_return_focus_(false) {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 if (need_return_focus_) { 135 if (need_return_focus_) {
146 const views::View* first = GetFirstFocusableChild(); 136 const views::View* first = GetFirstFocusableChild();
147 const views::View* last = GetLastFocusableChild(); 137 const views::View* last = GetLastFocusableChild();
148 const bool first_to_last = (focused_before == first && focused_now == last); 138 const bool first_to_last = (focused_before == first && focused_now == last);
149 const bool last_to_first = (focused_now == first && focused_before == last); 139 const bool last_to_first = (focused_now == first && focused_before == last);
150 140
151 if (first_to_last || last_to_first) 141 if (first_to_last || last_to_first)
152 ReturnFocus(first_to_last); 142 ReturnFocus(first_to_last);
153 } 143 }
154 } 144 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/status_area_button.h ('k') | chrome/browser/chromeos/status/status_area_view_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698