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

Side by Side Diff: webkit/tools/test_shell/test_shell_platform_delegate_win.cc

Issue 10310136: ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 8 years, 7 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 | « webkit/glue/webthemeengine_impl_win.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 #include <list> 6 #include <list>
7 #include <windows.h> 7 #include <windows.h>
8 #include <commctrl.h> 8 #include <commctrl.h>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/event_recorder.h" 11 #include "base/event_recorder.h"
12 #include "base/win/win_util.h" 12 #include "base/win/win_util.h"
13 #include "ui/base/win/foreground_helper.h" 13 #include "ui/base/win/foreground_helper.h"
14 #include "ui/gfx/native_theme_win.h" 14 #include "ui/base/native_theme/native_theme_win.h"
15 #include "webkit/tools/test_shell/test_shell.h" 15 #include "webkit/tools/test_shell/test_shell.h"
16 #include "webkit/tools/test_shell/test_shell_platform_delegate.h" 16 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"
17 17
18 TestShellPlatformDelegate::TestShellPlatformDelegate( 18 TestShellPlatformDelegate::TestShellPlatformDelegate(
19 const CommandLine& command_line) 19 const CommandLine& command_line)
20 : command_line_(command_line) { 20 : command_line_(command_line) {
21 #ifdef _CRTDBG_MAP_ALLOC 21 #ifdef _CRTDBG_MAP_ALLOC
22 _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); 22 _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
23 _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); 23 _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
24 #endif 24 #endif
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 void TestShellPlatformDelegate::InitializeGUI() { 133 void TestShellPlatformDelegate::InitializeGUI() {
134 INITCOMMONCONTROLSEX InitCtrlEx; 134 INITCOMMONCONTROLSEX InitCtrlEx;
135 135
136 InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX); 136 InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
137 InitCtrlEx.dwICC = ICC_STANDARD_CLASSES; 137 InitCtrlEx.dwICC = ICC_STANDARD_CLASSES;
138 InitCommonControlsEx(&InitCtrlEx); 138 InitCommonControlsEx(&InitCtrlEx);
139 TestShell::RegisterWindowClass(); 139 TestShell::RegisterWindowClass();
140 } 140 }
141 141
142 void TestShellPlatformDelegate::SelectUnifiedTheme() { 142 void TestShellPlatformDelegate::SelectUnifiedTheme() {
143 gfx::NativeThemeWin::instance()->DisableTheming(); 143 ui::NativeThemeWin::instance()->DisableTheming();
144 } 144 }
145 145
146 void TestShellPlatformDelegate::SetWindowPositionForRecording( 146 void TestShellPlatformDelegate::SetWindowPositionForRecording(
147 TestShell *shell) { 147 TestShell *shell) {
148 // Move the window to the upper left corner for consistent 148 // Move the window to the upper left corner for consistent
149 // record/playback mode. For automation, we want this to work 149 // record/playback mode. For automation, we want this to work
150 // on build systems where the script invoking us is a background 150 // on build systems where the script invoking us is a background
151 // process. So for this case, make our window the topmost window 151 // process. So for this case, make our window the topmost window
152 // as well. 152 // as well.
153 CHECK(ui::ForegroundHelper::SetForeground(shell->mainWnd()) == S_OK); 153 CHECK(ui::ForegroundHelper::SetForeground(shell->mainWnd()) == S_OK);
154 ::SetWindowPos(shell->mainWnd(), HWND_TOP, 0, 0, 600, 800, 0); 154 ::SetWindowPos(shell->mainWnd(), HWND_TOP, 0, 0, 600, 800, 0);
155 } 155 }
OLDNEW
« no previous file with comments | « webkit/glue/webthemeengine_impl_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698