Commit 107d6e00 authored by alexeypa@chromium.org's avatar alexeypa@chromium.org

Using Vista common controls library to show pretty controls in the PIN confirmation dialog.

Review URL: https://chromiumcodereview.appspot.com/10270034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134790 0039d316-1c4b-4281-b951-d872f2087c98
parent ab550118
...@@ -31,6 +31,12 @@ remoting::ElevatedControllerModuleWin _AtlModule; ...@@ -31,6 +31,12 @@ remoting::ElevatedControllerModuleWin _AtlModule;
int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int command) { int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int command) {
CommandLine::Init(0, NULL); CommandLine::Init(0, NULL);
// Register and initialize common controls.
INITCOMMONCONTROLSEX info;
info.dwSize = sizeof(info);
info.dwICC = ICC_STANDARD_CLASSES;
InitCommonControlsEx(&info);
// This object instance is required by Chrome code (for example, // This object instance is required by Chrome code (for example,
// FilePath, LazyInstance, MessageLoop). // FilePath, LazyInstance, MessageLoop).
base::AtExitManager exit_manager; base::AtExitManager exit_manager;
......
...@@ -429,9 +429,21 @@ ...@@ -429,9 +429,21 @@
'host/verify_config_window_win.h', 'host/verify_config_window_win.h',
'<(SHARED_INTERMEDIATE_DIR)/remoting/elevated_controller_version.rc' '<(SHARED_INTERMEDIATE_DIR)/remoting/elevated_controller_version.rc'
], ],
'link_settings': {
'libraries': [
'-lcomctl32.lib',
],
},
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalOptions': ["/MANIFESTUAC:level='requireAdministrator'"], 'AdditionalOptions': [
"/MANIFESTUAC:level='requireAdministrator'",
"\"/manifestdependency:type='win32' "
"name='Microsoft.Windows.Common-Controls' "
"version='6.0.0.0' "
"processorArchitecture='*' "
"publicKeyToken='6595b64144ccf1df' language='*'\"",
],
# 2 == /SUBSYSTEM:WINDOWS # 2 == /SUBSYSTEM:WINDOWS
'SubSystem': '2', 'SubSystem': '2',
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment