OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ | 5 #ifndef CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ |
6 #define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ | 6 #define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 virtual std::wstring GetDialogTitle() const { | 70 virtual std::wstring GetDialogTitle() const { |
71 return l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL); | 71 return l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL); |
72 } | 72 } |
73 | 73 |
74 // HtmlDialogUIDelegate implementation. | 74 // HtmlDialogUIDelegate implementation. |
75 virtual bool IsDialogModal() const { | 75 virtual bool IsDialogModal() const { |
76 return false; | 76 return false; |
77 } | 77 } |
78 | 78 |
79 void OnUserSubmittedAuth(const std::string& username, | 79 void OnUserSubmittedAuth(const std::string& username, |
80 const std::string& password) { | 80 const std::string& password, |
81 service_->OnUserSubmittedAuth(username, password); | 81 const std::string& captcha) { |
| 82 service_->OnUserSubmittedAuth(username, password, captcha); |
82 } | 83 } |
83 | 84 |
84 void OnUserAcceptedMergeAndSync() { | 85 void OnUserAcceptedMergeAndSync() { |
85 service_->OnUserAcceptedMergeAndSync(); | 86 service_->OnUserAcceptedMergeAndSync(); |
86 } | 87 } |
87 | 88 |
88 private: | 89 private: |
89 FRIEND_TEST(SyncSetupWizardTest, InitialStepLogin); | 90 FRIEND_TEST(SyncSetupWizardTest, InitialStepLogin); |
90 FRIEND_TEST(SyncSetupWizardTest, InitialStepMergeAndSync); | 91 FRIEND_TEST(SyncSetupWizardTest, InitialStepMergeAndSync); |
91 FRIEND_TEST(SyncSetupWizardTest, DialogCancelled); | 92 FRIEND_TEST(SyncSetupWizardTest, DialogCancelled); |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 } | 178 } |
178 | 179 |
179 private: | 180 private: |
180 void ExecuteJavascriptInIFrame(const std::wstring& iframe_xpath, | 181 void ExecuteJavascriptInIFrame(const std::wstring& iframe_xpath, |
181 const std::wstring& js); | 182 const std::wstring& js); |
182 SyncSetupFlow* flow_; | 183 SyncSetupFlow* flow_; |
183 DISALLOW_COPY_AND_ASSIGN(FlowHandler); | 184 DISALLOW_COPY_AND_ASSIGN(FlowHandler); |
184 }; | 185 }; |
185 | 186 |
186 #endif // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ | 187 #endif // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_ |
OLD | NEW |