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

Side by Side Diff: ui/views/controls/label.h

Issue 8742030: views: Move view.h to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and fix conflicts 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 | « ui/views/controls/image_view.h ('k') | ui/views/controls/menu/menu_item_view.h » ('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 #ifndef UI_VIEWS_CONTROLS_LABEL_H_ 5 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
6 #define UI_VIEWS_CONTROLS_LABEL_H_ 6 #define UI_VIEWS_CONTROLS_LABEL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "googleurl/src/gurl.h" 14 #include "googleurl/src/gurl.h"
15 #include "third_party/skia/include/core/SkColor.h" 15 #include "third_party/skia/include/core/SkColor.h"
16 #include "ui/gfx/font.h" 16 #include "ui/gfx/font.h"
17 #include "views/view.h" 17 #include "ui/views/view.h"
18 18
19 namespace views { 19 namespace views {
20 20
21 ///////////////////////////////////////////////////////////////////////////// 21 /////////////////////////////////////////////////////////////////////////////
22 // 22 //
23 // Label class 23 // Label class
24 // 24 //
25 // A label is a view subclass that can display a string. 25 // A label is a view subclass that can display a string.
26 // 26 //
27 ///////////////////////////////////////////////////////////////////////////// 27 /////////////////////////////////////////////////////////////////////////////
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // allows this view to reserve space for a focus border that it otherwise 280 // allows this view to reserve space for a focus border that it otherwise
281 // might not have because it is not itself focusable. 281 // might not have because it is not itself focusable.
282 bool has_focus_border_; 282 bool has_focus_border_;
283 283
284 DISALLOW_COPY_AND_ASSIGN(Label); 284 DISALLOW_COPY_AND_ASSIGN(Label);
285 }; 285 };
286 286
287 } // namespace views 287 } // namespace views
288 288
289 #endif // UI_VIEWS_CONTROLS_LABEL_H_ 289 #endif // UI_VIEWS_CONTROLS_LABEL_H_
OLDNEW
« no previous file with comments | « ui/views/controls/image_view.h ('k') | ui/views/controls/menu/menu_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698