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

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

Issue 909183002: win/aura: Remove some more non-aura code for Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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
« no previous file with comments | « no previous file | chrome/browser/lifetime/application_lifetime.h » ('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) 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 } 190 }
191 } 191 }
192 192
193 ChromeBrowserMainPartsWin::~ChromeBrowserMainPartsWin() { 193 ChromeBrowserMainPartsWin::~ChromeBrowserMainPartsWin() {
194 } 194 }
195 195
196 void ChromeBrowserMainPartsWin::ToolkitInitialized() { 196 void ChromeBrowserMainPartsWin::ToolkitInitialized() {
197 ChromeBrowserMainParts::ToolkitInitialized(); 197 ChromeBrowserMainParts::ToolkitInitialized();
198 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont; 198 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont;
199 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize; 199 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize;
200 #if defined(USE_AURA)
201 ui::CursorLoaderWin::SetCursorResourceModule(chrome::kBrowserResourcesDll); 200 ui::CursorLoaderWin::SetCursorResourceModule(chrome::kBrowserResourcesDll);
202 #endif
203 } 201 }
204 202
205 void ChromeBrowserMainPartsWin::PreMainMessageLoopStart() { 203 void ChromeBrowserMainPartsWin::PreMainMessageLoopStart() {
206 // installer_util references strings that are normally compiled into 204 // installer_util references strings that are normally compiled into
207 // setup.exe. In Chrome, these strings are in the locale files. 205 // setup.exe. In Chrome, these strings are in the locale files.
208 SetupInstallerUtilStrings(); 206 SetupInstallerUtilStrings();
209 207
210 ChromeBrowserMainParts::PreMainMessageLoopStart(); 208 ChromeBrowserMainParts::PreMainMessageLoopStart();
211 if (!parameters().ui_task) { 209 if (!parameters().ui_task) {
212 // Make sure that we know how to handle exceptions from the message loop. 210 // Make sure that we know how to handle exceptions from the message loop.
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 if (resource_id) 457 if (resource_id)
460 return l10n_util::GetStringUTF16(resource_id); 458 return l10n_util::GetStringUTF16(resource_id);
461 return base::string16(); 459 return base::string16();
462 } 460 }
463 461
464 // static 462 // static
465 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 463 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
466 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 464 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
467 installer::SetTranslationDelegate(&delegate); 465 installer::SetTranslationDelegate(&delegate);
468 } 466 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/lifetime/application_lifetime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698