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

Side by Side Diff: views/controls/menu/menu_scroll_view_container.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « views/controls/menu/menu_item_view_win.cc ('k') | views/controls/menu/menu_separator_gtk.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "views/controls/menu/menu_scroll_view_container.h" 5 #include "views/controls/menu/menu_scroll_view_container.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <uxtheme.h> 9 #include <uxtheme.h>
10 #include <Vssym32.h> 10 #include <Vssym32.h>
11 #endif 11 #endif
12 12
13 #include "gfx/canvas_skia.h" 13 #include "ui/gfx/canvas_skia.h"
14 #include "gfx/color_utils.h" 14 #include "ui/gfx/color_utils.h"
15 #include "views/border.h" 15 #include "views/border.h"
16 #include "third_party/skia/include/effects/SkGradientShader.h" 16 #include "third_party/skia/include/effects/SkGradientShader.h"
17 #include "views/controls/menu/menu_config.h" 17 #include "views/controls/menu/menu_config.h"
18 #include "views/controls/menu/menu_controller.h" 18 #include "views/controls/menu/menu_controller.h"
19 #include "views/controls/menu/menu_item_view.h" 19 #include "views/controls/menu/menu_item_view.h"
20 #include "views/controls/menu/submenu_view.h" 20 #include "views/controls/menu/submenu_view.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "gfx/native_theme_win.h" 23 #include "ui/gfx/native_theme_win.h"
24 #endif 24 #endif
25 25
26 #if defined(OS_WIN) 26 #if defined(OS_WIN)
27 using gfx::NativeTheme; 27 using gfx::NativeTheme;
28 #endif 28 #endif
29 29
30 // Height of the scroll arrow. 30 // Height of the scroll arrow.
31 // This goes up to 4 with large fonts, but this is close enough for now. 31 // This goes up to 4 with large fonts, but this is close enough for now.
32 static const int scroll_arrow_height = 3; 32 static const int scroll_arrow_height = 3;
33 33
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 return AccessibilityTypes::ROLE_MENUBAR; 271 return AccessibilityTypes::ROLE_MENUBAR;
272 } 272 }
273 273
274 AccessibilityTypes::State MenuScrollViewContainer::GetAccessibleState() { 274 AccessibilityTypes::State MenuScrollViewContainer::GetAccessibleState() {
275 // Some AT (like NVDA) will not process focus events on menu item children 275 // Some AT (like NVDA) will not process focus events on menu item children
276 // unless a parent claims to be focused. 276 // unless a parent claims to be focused.
277 return AccessibilityTypes::STATE_FOCUSED; 277 return AccessibilityTypes::STATE_FOCUSED;
278 } 278 }
279 279
280 } // namespace views 280 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/menu_item_view_win.cc ('k') | views/controls/menu/menu_separator_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698