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

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

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (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
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 "views/border.h" 14 #include "ui/views/border.h"
15 15
16 // Number of pixels to separate each icon. 16 // Number of pixels to separate each icon.
17 #if defined(TOUCH_UI) 17 #if defined(TOUCH_UI)
18 const int kSeparation = 25; 18 const int kSeparation = 25;
19 #else 19 #else
20 const int kSeparation = 0; 20 const int kSeparation = 0;
21 #endif 21 #endif
22 22
23 StatusAreaView::StatusAreaView() 23 StatusAreaView::StatusAreaView()
24 : need_return_focus_(false) { 24 : need_return_focus_(false) {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 if (need_return_focus_) { 137 if (need_return_focus_) {
138 const views::View* first = GetFirstFocusableChild(); 138 const views::View* first = GetFirstFocusableChild();
139 const views::View* last = GetLastFocusableChild(); 139 const views::View* last = GetLastFocusableChild();
140 const bool first_to_last = (focused_before == first && focused_now == last); 140 const bool first_to_last = (focused_before == first && focused_now == last);
141 const bool last_to_first = (focused_now == first && focused_before == last); 141 const bool last_to_first = (focused_now == first && focused_before == last);
142 142
143 if (first_to_last || last_to_first) 143 if (first_to_last || last_to_first)
144 ReturnFocus(first_to_last); 144 ReturnFocus(first_to_last);
145 } 145 }
146 } 146 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view.h ('k') | chrome/browser/chromeos/views/copy_background.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698