| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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_frame/chrome_frame_automation.h" | 5 #include "chrome_frame/chrome_frame_automation.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/file_version_info.h" | 10 #include "base/file_version_info.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 | 227 |
| 228 // The metrics bug out because they attempt to use URLFetcher with a | 228 // The metrics bug out because they attempt to use URLFetcher with a |
| 229 // null URLRequestContext::default_request_context_. Turn them off for now. | 229 // null URLRequestContext::default_request_context_. Turn them off for now. |
| 230 // TODO(robertshield): Figure out why this is. It appears to have something | 230 // TODO(robertshield): Figure out why this is. It appears to have something |
| 231 // to do with an improperly set up profile... | 231 // to do with an improperly set up profile... |
| 232 command_line->AppendSwitch(switches::kDisableMetrics); | 232 command_line->AppendSwitch(switches::kDisableMetrics); |
| 233 | 233 |
| 234 // Chrome Frame never wants Chrome to start up with a First Run UI. | 234 // Chrome Frame never wants Chrome to start up with a First Run UI. |
| 235 command_line->AppendSwitch(switches::kNoFirstRun); | 235 command_line->AppendSwitch(switches::kNoFirstRun); |
| 236 | 236 |
| 237 command_line->AppendSwitch(switches::kEnableRendererAccessibility); |
| 238 |
| 237 // Place the profile directory in | 239 // Place the profile directory in |
| 238 // "<chrome_exe_path>\..\User Data\<profile-name>" | 240 // "<chrome_exe_path>\..\User Data\<profile-name>" |
| 239 if (!entry->profile_name.empty()) { | 241 if (!entry->profile_name.empty()) { |
| 240 std::wstring profile_path; | 242 std::wstring profile_path; |
| 241 if (GetUserProfileBaseDirectory(&profile_path)) { | 243 if (GetUserProfileBaseDirectory(&profile_path)) { |
| 242 file_util::AppendToPath(&profile_path, entry->profile_name); | 244 file_util::AppendToPath(&profile_path, entry->profile_name); |
| 243 command_line->AppendSwitchWithValue(switches::kUserDataDir, | 245 command_line->AppendSwitchWithValue(switches::kUserDataDir, |
| 244 profile_path); | 246 profile_path); |
| 245 } else { | 247 } else { |
| 246 // Can't get the profile dir :-( We need one to work, so fail. | 248 // Can't get the profile dir :-( We need one to work, so fail. |
| (...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 971 return true; | 973 return true; |
| 972 } | 974 } |
| 973 | 975 |
| 974 void ChromeFrameAutomationClient::AttachExternalTab( | 976 void ChromeFrameAutomationClient::AttachExternalTab( |
| 975 intptr_t external_tab_cookie) { | 977 intptr_t external_tab_cookie) { |
| 976 DCHECK(tab_.get() == NULL); | 978 DCHECK(tab_.get() == NULL); |
| 977 DCHECK(tab_handle_ == -1); | 979 DCHECK(tab_handle_ == -1); |
| 978 | 980 |
| 979 external_tab_cookie_ = external_tab_cookie; | 981 external_tab_cookie_ = external_tab_cookie; |
| 980 } | 982 } |
| OLD | NEW |