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

Side by Side Diff: views/controls/menu/menu_config_win.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_config.h ('k') | views/controls/menu/menu_controller.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_config.h" 5 #include "views/controls/menu/menu_config.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <uxtheme.h> 8 #include <uxtheme.h>
9 #include <Vssym32.h> 9 #include <Vssym32.h>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/win/win_util.h" 12 #include "base/win/win_util.h"
13 #include "gfx/native_theme_win.h"
14 #include "ui/base/l10n/l10n_util_win.h" 13 #include "ui/base/l10n/l10n_util_win.h"
14 #include "ui/gfx/native_theme_win.h"
15 15
16 using gfx::NativeTheme; 16 using gfx::NativeTheme;
17 17
18 namespace views { 18 namespace views {
19 19
20 // static 20 // static
21 MenuConfig* MenuConfig::Create() { 21 MenuConfig* MenuConfig::Create() {
22 MenuConfig* config = new MenuConfig(); 22 MenuConfig* config = new MenuConfig();
23 23
24 config->text_color = NativeTheme::instance()->GetThemeColorWithDefault( 24 config->text_color = NativeTheme::instance()->GetThemeColorWithDefault(
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 ReleaseDC(NULL, dc); 92 ReleaseDC(NULL, dc);
93 93
94 BOOL show_cues; 94 BOOL show_cues;
95 config->show_mnemonics = 95 config->show_mnemonics =
96 (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && 96 (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) &&
97 show_cues == TRUE); 97 show_cues == TRUE);
98 return config; 98 return config;
99 } 99 }
100 100
101 } // namespace views 101 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/menu_config.h ('k') | views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698