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 #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 "base/ref_counted.h" | 8 #include "base/ref_counted.h" |
9 #include "base/win_util.h" | 9 #include "base/win_util.h" |
10 #include "chrome_frame/chrome_frame_automation.h" | 10 #include "chrome_frame/chrome_frame_automation.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 void Uninitialize() { | 51 void Uninitialize() { |
52 DLOG(INFO) << __FUNCTION__; | 52 DLOG(INFO) << __FUNCTION__; |
53 if (IsValid()) { | 53 if (IsValid()) { |
54 automation_client_->Uninitialize(); | 54 automation_client_->Uninitialize(); |
55 automation_client_ = NULL; | 55 automation_client_ = NULL; |
56 } | 56 } |
57 } | 57 } |
58 | 58 |
59 bool InitializeAutomation(const std::wstring& profile_name, | 59 bool InitializeAutomation(const std::wstring& profile_name, |
60 const std::wstring& extra_chrome_arguments, | 60 const std::wstring& extra_chrome_arguments, |
61 bool incognito) { | 61 bool incognito, bool is_widget_mode) { |
62 DCHECK(IsValid()); | 62 DCHECK(IsValid()); |
63 // We don't want to do incognito when privileged, since we're | 63 // We don't want to do incognito when privileged, since we're |
64 // running in browser chrome or some other privileged context. | 64 // running in browser chrome or some other privileged context. |
65 bool incognito_mode = !is_privileged_ && incognito; | 65 bool incognito_mode = !is_privileged_ && incognito; |
66 FilePath profile_path; | 66 FilePath profile_path; |
67 GetProfilePath(profile_name, &profile_path); | 67 GetProfilePath(profile_name, &profile_path); |
68 return automation_client_->Initialize(this, kCommandExecutionTimeout, true, | 68 ChromeFrameLaunchParams chrome_launch_params = { |
69 profile_path, extra_chrome_arguments, | 69 kCommandExecutionTimeout, |
70 incognito_mode); | 70 GURL(), |
| 71 GURL(), |
| 72 profile_path, |
| 73 profile_name, |
| 74 extra_chrome_arguments, |
| 75 true, |
| 76 incognito_mode, |
| 77 is_widget_mode |
| 78 }; |
| 79 return automation_client_->Initialize(this, chrome_launch_params); |
71 } | 80 } |
72 | 81 |
73 // ChromeFrameDelegate implementation | 82 // ChromeFrameDelegate implementation |
74 virtual WindowType GetWindow() const { | 83 virtual WindowType GetWindow() const { |
75 return (static_cast<const T*>(this))->m_hWnd; | 84 return (static_cast<const T*>(this))->m_hWnd; |
76 } | 85 } |
77 | 86 |
78 virtual void GetBounds(RECT* bounds) { | 87 virtual void GetBounds(RECT* bounds) { |
79 if (bounds) { | 88 if (bounds) { |
80 if (::IsWindow(GetWindow())) { | 89 if (::IsWindow(GetWindow())) { |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 | 255 |
247 // List of functions to enable for automation, or a single entry "*" to | 256 // List of functions to enable for automation, or a single entry "*" to |
248 // enable all functions for automation. Ignored unless is_privileged_ is | 257 // enable all functions for automation. Ignored unless is_privileged_ is |
249 // true. Defaults to the empty list, meaning automation will not be | 258 // true. Defaults to the empty list, meaning automation will not be |
250 // turned on. | 259 // turned on. |
251 std::vector<std::string> functions_enabled_; | 260 std::vector<std::string> functions_enabled_; |
252 }; | 261 }; |
253 | 262 |
254 #endif // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ | 263 #endif // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ |
255 | 264 |
OLD | NEW |