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

Side by Side Diff: chrome/browser/chrome_browser_main_win.cc

Issue 10211006: Removing the kEnableTouchEvents switch temporarily from metro chrome as it is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « no previous file | 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 "chrome/browser/chrome_browser_main_win.h" 5 #include "chrome/browser/chrome_browser_main_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 return ret; 157 return ret;
158 } 158 }
159 159
160 // ChromeBrowserMainPartsWin --------------------------------------------------- 160 // ChromeBrowserMainPartsWin ---------------------------------------------------
161 161
162 ChromeBrowserMainPartsWin::ChromeBrowserMainPartsWin( 162 ChromeBrowserMainPartsWin::ChromeBrowserMainPartsWin(
163 const content::MainFunctionParams& parameters) 163 const content::MainFunctionParams& parameters)
164 : ChromeBrowserMainParts(parameters) { 164 : ChromeBrowserMainParts(parameters) {
165 if (base::win::GetMetroModule()) { 165 if (base::win::GetMetroModule()) {
166 CommandLine::ForCurrentProcess()->AppendSwitch( 166 CommandLine::ForCurrentProcess()->AppendSwitch(
167 switches::kEnableTouchEvents); 167 switches::kTouchOptimizedUI);
168 } 168 }
169 } 169 }
170 170
171 void ChromeBrowserMainPartsWin::ToolkitInitialized() { 171 void ChromeBrowserMainPartsWin::ToolkitInitialized() {
172 ChromeBrowserMainParts::ToolkitInitialized(); 172 ChromeBrowserMainParts::ToolkitInitialized();
173 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont; 173 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont;
174 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize; 174 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize;
175 } 175 }
176 176
177 void ChromeBrowserMainPartsWin::PreMainMessageLoopStart() { 177 void ChromeBrowserMainPartsWin::PreMainMessageLoopStart() {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall); 308 uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall);
309 uninstall_cmd.AppendSwitch( 309 uninstall_cmd.AppendSwitch(
310 installer::switches::kDoNotRemoveSharedItems); 310 installer::switches::kDoNotRemoveSharedItems);
311 base::LaunchProcess(uninstall_cmd, base::LaunchOptions(), NULL); 311 base::LaunchProcess(uninstall_cmd, base::LaunchOptions(), NULL);
312 } 312 }
313 return true; 313 return true;
314 } 314 }
315 } 315 }
316 return false; 316 return false;
317 } 317 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698