Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Side by Side Diff: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/api/feedback_private/feedback_private_api.h" 5 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 15 matching lines...) Expand all
26 #include "components/feedback/tracing_manager.h" 26 #include "components/feedback/tracing_manager.h"
27 #include "components/signin/core/browser/signin_manager.h" 27 #include "components/signin/core/browser/signin_manager.h"
28 #include "components/strings/grit/components_strings.h" 28 #include "components/strings/grit/components_strings.h"
29 #include "content/public/browser/user_metrics.h" 29 #include "content/public/browser/user_metrics.h"
30 #include "extensions/browser/event_router.h" 30 #include "extensions/browser/event_router.h"
31 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/webui/web_ui_util.h" 32 #include "ui/base/webui/web_ui_util.h"
33 #include "url/url_util.h" 33 #include "url/url_util.h"
34 34
35 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
36 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 36 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
37 #endif // defined(OS_CHROMEOS) 37 #endif // defined(OS_CHROMEOS)
38 38
39 #if defined(OS_WIN) 39 #if defined(OS_WIN)
40 #include "base/feature_list.h" 40 #include "base/feature_list.h"
41 #include "chrome/browser/safe_browsing/srt_fetcher_win.h" 41 #include "chrome/browser/safe_browsing/srt_fetcher_win.h"
42 #endif 42 #endif
43 43
44 using extensions::api::feedback_private::SystemInformation; 44 using extensions::api::feedback_private::SystemInformation;
45 using feedback::FeedbackData; 45 using feedback::FeedbackData;
46 46
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); 157 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
158 158
159 #define SET_STRING(id, idr) \ 159 #define SET_STRING(id, idr) \
160 dict->SetString(id, l10n_util::GetStringUTF16(idr)) 160 dict->SetString(id, l10n_util::GetStringUTF16(idr))
161 SET_STRING("page-title", IDS_FEEDBACK_REPORT_PAGE_TITLE); 161 SET_STRING("page-title", IDS_FEEDBACK_REPORT_PAGE_TITLE);
162 SET_STRING("additionalInfo", IDS_FEEDBACK_ADDITIONAL_INFO_LABEL); 162 SET_STRING("additionalInfo", IDS_FEEDBACK_ADDITIONAL_INFO_LABEL);
163 SET_STRING("page-url", IDS_FEEDBACK_REPORT_URL_LABEL); 163 SET_STRING("page-url", IDS_FEEDBACK_REPORT_URL_LABEL);
164 SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL); 164 SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL);
165 SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL); 165 SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL);
166 #if defined(OS_CHROMEOS) 166 #if defined(OS_CHROMEOS)
167 const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get(); 167 const arc::ArcSessionManager* arc_session_manager =
168 if (auth_service && auth_service->IsArcEnabled()) { 168 arc::ArcSessionManager::Get();
169 if (arc_session_manager && arc_session_manager->IsArcEnabled()) {
169 SET_STRING("sys-info", 170 SET_STRING("sys-info",
170 IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX_ARC); 171 IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX_ARC);
171 } else { 172 } else {
172 SET_STRING("sys-info", 173 SET_STRING("sys-info",
173 IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX); 174 IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX);
174 } 175 }
175 #else 176 #else
176 SET_STRING("sys-info", IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_CHKBOX); 177 SET_STRING("sys-info", IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_CHKBOX);
177 #endif 178 #endif
178 SET_STRING("attach-file-label", IDS_FEEDBACK_ATTACH_FILE_LABEL); 179 SET_STRING("attach-file-label", IDS_FEEDBACK_ATTACH_FILE_LABEL);
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 content::RecordAction( 338 content::RecordAction(
338 base::UserMetricsAction("Feedback.SrtPromptClosed")); 339 base::UserMetricsAction("Feedback.SrtPromptClosed"));
339 break; 340 break;
340 default: 341 default:
341 return RespondNow(Error("Invalid arugment.")); 342 return RespondNow(Error("Invalid arugment."));
342 } 343 }
343 return RespondNow(NoArguments()); 344 return RespondNow(NoArguments());
344 } 345 }
345 346
346 } // namespace extensions 347 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698