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

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

Issue 8914021: Remove remaining TOUCH_UI code under chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc ('k') | 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/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) 16 #if defined(USE_AURA)
17 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
18 #endif 18 #endif
19 19
20 // Number of pixels to separate each icon. 20 // Number of pixels to separate each icon.
21 #if defined(TOUCH_UI)
22 const int kSeparation = 25;
23 #else
24 const int kSeparation = 0; 21 const int kSeparation = 0;
25 #endif
26 22
27 StatusAreaView::StatusAreaView() 23 StatusAreaView::StatusAreaView()
28 : need_return_focus_(false) { 24 : need_return_focus_(false) {
29 set_id(VIEW_ID_STATUS_AREA); 25 set_id(VIEW_ID_STATUS_AREA);
30 } 26 }
31 27
32 StatusAreaView::~StatusAreaView() { 28 StatusAreaView::~StatusAreaView() {
33 } 29 }
34 30
35 void StatusAreaView::AddButton(StatusAreaButton* button, bool bordered) { 31 void StatusAreaView::AddButton(StatusAreaButton* button, bool bordered) {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 if (need_return_focus_) { 141 if (need_return_focus_) {
146 const views::View* first = GetFirstFocusableChild(); 142 const views::View* first = GetFirstFocusableChild();
147 const views::View* last = GetLastFocusableChild(); 143 const views::View* last = GetLastFocusableChild();
148 const bool first_to_last = (focused_before == first && focused_now == last); 144 const bool first_to_last = (focused_before == first && focused_now == last);
149 const bool last_to_first = (focused_now == first && focused_before == last); 145 const bool last_to_first = (focused_now == first && focused_before == last);
150 146
151 if (first_to_last || last_to_first) 147 if (first_to_last || last_to_first)
152 ReturnFocus(first_to_last); 148 ReturnFocus(first_to_last);
153 } 149 }
154 } 150 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698