OLD | NEW |
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 #ifndef CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ | 5 #ifndef CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ |
6 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ | 6 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 HWND chrome_window = automation_client_->tab_window(); | 233 HWND chrome_window = automation_client_->tab_window(); |
234 if (tab && ::IsWindow(chrome_window)) { | 234 if (tab && ::IsWindow(chrome_window)) { |
235 DVLOG(1) << "Setting initial focus"; | 235 DVLOG(1) << "Setting initial focus"; |
236 tab->SetInitialFocus(base::win::IsShiftPressed(), restore_focus_to_view)
; | 236 tab->SetInitialFocus(base::win::IsShiftPressed(), restore_focus_to_view)
; |
237 } | 237 } |
238 } | 238 } |
239 } | 239 } |
240 | 240 |
241 virtual void GetProfilePath(const std::wstring& profile_name, | 241 virtual void GetProfilePath(const std::wstring& profile_name, |
242 FilePath* profile_path) { | 242 FilePath* profile_path) { |
243 chrome::GetChromeFrameUserDataDirectory(profile_path); | 243 return GetChromeFrameProfilePath(profile_name, profile_path); |
244 *profile_path = profile_path->Append(profile_name); | |
245 DVLOG(1) << __FUNCTION__ << ": " << profile_path->value(); | |
246 } | 244 } |
247 | 245 |
248 protected: | 246 protected: |
249 // Our gateway to chrome land | 247 // Our gateway to chrome land |
250 scoped_refptr<ChromeFrameAutomationClient> automation_client_; | 248 scoped_refptr<ChromeFrameAutomationClient> automation_client_; |
251 | 249 |
252 // How we launched Chrome. | 250 // How we launched Chrome. |
253 scoped_refptr<ChromeFrameLaunchParams> launch_params_; | 251 scoped_refptr<ChromeFrameLaunchParams> launch_params_; |
254 | 252 |
255 // Url of the containing document. | 253 // Url of the containing document. |
256 std::string document_url_; | 254 std::string document_url_; |
257 | 255 |
258 // We set this flag when we're taking the focus ourselves | 256 // We set this flag when we're taking the focus ourselves |
259 // and notifying the host browser that we're doing so. | 257 // and notifying the host browser that we're doing so. |
260 // When the flag is not set, we transfer the focus to chrome. | 258 // When the flag is not set, we transfer the focus to chrome. |
261 bool ignore_setfocus_; | 259 bool ignore_setfocus_; |
262 }; | 260 }; |
263 | 261 |
264 #endif // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ | 262 #endif // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ |
OLD | NEW |