OLD | NEW |
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 "chrome/browser/browser_init.h" | 5 #include "chrome/browser/browser_init.h" |
6 | 6 |
7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 } | 365 } |
366 | 366 |
367 bool BrowserInit::LaunchBrowser(const CommandLine& command_line, | 367 bool BrowserInit::LaunchBrowser(const CommandLine& command_line, |
368 Profile* profile, | 368 Profile* profile, |
369 const FilePath& cur_dir, | 369 const FilePath& cur_dir, |
370 bool process_startup, | 370 bool process_startup, |
371 int* return_code) { | 371 int* return_code) { |
372 in_startup = process_startup; | 372 in_startup = process_startup; |
373 DCHECK(profile); | 373 DCHECK(profile); |
374 | 374 |
375 #if defined(OS_WIN) | |
376 // Disable the DPI-virtualization mode of Windows Vista or later because it | |
377 // causes some problems when using system messages (such as WM_NCHITTEST and | |
378 // WM_GETTITLEBARINFOEX) on a custom frame. | |
379 win_util::CallSetProcessDPIAware(); | |
380 #endif | |
381 | |
382 // Continue with the off-the-record profile from here on if --incognito | 375 // Continue with the off-the-record profile from here on if --incognito |
383 if (command_line.HasSwitch(switches::kIncognito)) | 376 if (command_line.HasSwitch(switches::kIncognito)) |
384 profile = profile->GetOffTheRecordProfile(); | 377 profile = profile->GetOffTheRecordProfile(); |
385 | 378 |
386 BrowserInit::LaunchWithProfile lwp(cur_dir, command_line, this); | 379 BrowserInit::LaunchWithProfile lwp(cur_dir, command_line, this); |
387 bool launched = lwp.Launch(profile, process_startup); | 380 bool launched = lwp.Launch(profile, process_startup); |
388 in_startup = false; | 381 in_startup = false; |
389 | 382 |
390 if (!launched) { | 383 if (!launched) { |
391 LOG(ERROR) << "launch error"; | 384 LOG(ERROR) << "launch error"; |
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1078 scoped_refptr<AutomationProviderClass> automation = | 1071 scoped_refptr<AutomationProviderClass> automation = |
1079 new AutomationProviderClass(profile); | 1072 new AutomationProviderClass(profile); |
1080 automation->ConnectToChannel(channel_id); | 1073 automation->ConnectToChannel(channel_id); |
1081 automation->SetExpectedTabCount(expected_tabs); | 1074 automation->SetExpectedTabCount(expected_tabs); |
1082 | 1075 |
1083 AutomationProviderList* list = | 1076 AutomationProviderList* list = |
1084 g_browser_process->InitAutomationProviderList(); | 1077 g_browser_process->InitAutomationProviderList(); |
1085 DCHECK(list); | 1078 DCHECK(list); |
1086 list->AddProvider(automation); | 1079 list->AddProvider(automation); |
1087 } | 1080 } |
OLD | NEW |