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

Side by Side Diff: chrome/browser/chromeos/arc/arc_support_host.cc

Issue 2206953003: Merge "arc: Implement scrollable OptIn window content." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 months 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/chromeos/arc/arc_support_host.h" 5 #include "chrome/browser/chromeos/arc/arc_support_host.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/common/system/chromeos/devicetype_utils.h" 9 #include "ash/common/system/chromeos/devicetype_utils.h"
10 #include "base/i18n/timezone.h" 10 #include "base/i18n/timezone.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
13 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/chromeos/profiles/profile_helper.h" 16 #include "chrome/browser/chromeos/profiles/profile_helper.h"
17 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 17 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
18 #include "chrome/browser/metrics/metrics_reporting_state.h" 18 #include "chrome/browser/metrics/metrics_reporting_state.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 20 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
21 #include "chrome/browser/ui/browser_commands.h" 21 #include "chrome/browser/ui/browser_commands.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
24 #include "components/metrics/metrics_pref_names.h" 24 #include "components/metrics/metrics_pref_names.h"
25 #include "components/prefs/pref_service.h" 25 #include "components/prefs/pref_service.h"
26 #include "components/user_manager/known_user.h" 26 #include "components/user_manager/known_user.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/webui/web_ui_util.h" 28 #include "ui/base/webui/web_ui_util.h"
29 #include "ui/display/screen.h"
29 30
30 namespace { 31 namespace {
31 const char kAction[] = "action"; 32 const char kAction[] = "action";
32 const char kBackupRestoreEnabled[] = "backupRestoreEnabled"; 33 const char kBackupRestoreEnabled[] = "backupRestoreEnabled";
33 const char kCanEnable[] = "canEnable"; 34 const char kCanEnable[] = "canEnable";
34 const char kCode[] = "code"; 35 const char kCode[] = "code";
35 const char kData[] = "data"; 36 const char kData[] = "data";
36 const char kDeviceId[] = "deviceId"; 37 const char kDeviceId[] = "deviceId";
37 const char kEnabled[] = "enabled"; 38 const char kEnabled[] = "enabled";
38 const char kOn[] = "on"; 39 const char kOn[] = "on";
39 const char kPage[] = "page"; 40 const char kPage[] = "page";
40 const char kStatus[] = "status"; 41 const char kStatus[] = "status";
41 const char kText[] = "text"; 42 const char kText[] = "text";
42 const char kActionInitialize[] = "initialize"; 43 const char kActionInitialize[] = "initialize";
43 const char kActionSetMetricsMode[] = "setMetricsMode"; 44 const char kActionSetMetricsMode[] = "setMetricsMode";
45 const char kActionSetWindowBounds[] = "setWindowBounds";
44 const char kActionStartLso[] = "startLso"; 46 const char kActionStartLso[] = "startLso";
45 const char kActionCancelAuthCode[] = "cancelAuthCode"; 47 const char kActionCancelAuthCode[] = "cancelAuthCode";
46 const char kActionSetAuthCode[] = "setAuthCode"; 48 const char kActionSetAuthCode[] = "setAuthCode";
47 const char kActionEnableMetrics[] = "enableMetrics"; 49 const char kActionEnableMetrics[] = "enableMetrics";
48 const char kActionSendFeedback[] = "sendFeedback"; 50 const char kActionSendFeedback[] = "sendFeedback";
49 const char kActionSetBackupRestore[] = "setBackupRestore"; 51 const char kActionSetBackupRestore[] = "setBackupRestore";
50 const char kActionCloseUI[] = "closeUI"; 52 const char kActionCloseUI[] = "closeUI";
51 const char kActionShowPage[] = "showPage"; 53 const char kActionShowPage[] = "showPage";
52 } // namespace 54 } // namespace
53 55
(...skipping 16 matching lines...) Expand all
70 } 72 }
71 73
72 ArcSupportHost::ArcSupportHost() { 74 ArcSupportHost::ArcSupportHost() {
73 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); 75 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
74 DCHECK(arc_auth_service); 76 DCHECK(arc_auth_service);
75 77
76 if (!arc_auth_service->IsAllowed()) 78 if (!arc_auth_service->IsAllowed())
77 return; 79 return;
78 80
79 arc_auth_service->AddObserver(this); 81 arc_auth_service->AddObserver(this);
82 display::Screen::GetScreen()->AddObserver(this);
80 83
81 pref_change_registrar_.Init(g_browser_process->local_state()); 84 pref_change_registrar_.Init(g_browser_process->local_state());
82 pref_change_registrar_.Add( 85 pref_change_registrar_.Add(
83 metrics::prefs::kMetricsReportingEnabled, 86 metrics::prefs::kMetricsReportingEnabled,
84 base::Bind(&ArcSupportHost::OnMetricsPreferenceChanged, 87 base::Bind(&ArcSupportHost::OnMetricsPreferenceChanged,
85 base::Unretained(this))); 88 base::Unretained(this)));
86 } 89 }
87 90
88 ArcSupportHost::~ArcSupportHost() { 91 ArcSupportHost::~ArcSupportHost() {
92 display::Screen::GetScreen()->RemoveObserver(this);
89 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); 93 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
90 if (arc_auth_service) 94 if (arc_auth_service)
91 arc_auth_service->RemoveObserver(this); 95 arc_auth_service->RemoveObserver(this);
92 } 96 }
93 97
94 void ArcSupportHost::Start(Client* client) { 98 void ArcSupportHost::Start(Client* client) {
95 DCHECK(!client_); 99 DCHECK(!client_);
96 client_ = client; 100 client_ = client;
97 101
98 if (!Initialize()) { 102 if (!Initialize()) {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 std::string request_string; 176 std::string request_string;
173 request.SetString(kAction, kActionInitialize); 177 request.SetString(kAction, kActionInitialize);
174 request.Set(kData, std::move(loadtime_data)); 178 request.Set(kData, std::move(loadtime_data));
175 request.SetString(kDeviceId, device_id); 179 request.SetString(kDeviceId, device_id);
176 base::JSONWriter::Write(request, &request_string); 180 base::JSONWriter::Write(request, &request_string);
177 client_->PostMessageFromNativeHost(request_string); 181 client_->PostMessageFromNativeHost(request_string);
178 182
179 return true; 183 return true;
180 } 184 }
181 185
186 void ArcSupportHost::OnDisplayAdded(const display::Display& new_display) {}
187
188 void ArcSupportHost::OnDisplayRemoved(const display::Display& old_display) {}
189
190 void ArcSupportHost::OnDisplayMetricsChanged(const display::Display& display,
191 uint32_t changed_metrics) {
192 base::DictionaryValue request;
193 std::string request_string;
194 request.SetString(kAction, kActionSetWindowBounds);
195 base::JSONWriter::Write(request, &request_string);
196 client_->PostMessageFromNativeHost(request_string);
197 }
198
182 void ArcSupportHost::OnMetricsPreferenceChanged() { 199 void ArcSupportHost::OnMetricsPreferenceChanged() {
183 SendMetricsMode(); 200 SendMetricsMode();
184 } 201 }
185 202
186 void ArcSupportHost::SendMetricsMode() { 203 void ArcSupportHost::SendMetricsMode() {
187 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); 204 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
188 DCHECK(arc_auth_service && arc_auth_service->IsAllowed()); 205 DCHECK(arc_auth_service && arc_auth_service->IsAllowed());
189 const Profile* profile = arc_auth_service->profile(); 206 const Profile* profile = arc_auth_service->profile();
190 207
191 const bool metrics_managed = IsMetricsReportingPolicyManaged(); 208 const bool metrics_managed = IsMetricsReportingPolicyManaged();
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 EnableBackupRestore(is_enabled); 314 EnableBackupRestore(is_enabled);
298 } else { 315 } else {
299 NOTREACHED(); 316 NOTREACHED();
300 } 317 }
301 } 318 }
302 319
303 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner() 320 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner()
304 const { 321 const {
305 return base::ThreadTaskRunnerHandle::Get(); 322 return base::ThreadTaskRunnerHandle::Get();
306 } 323 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_support_host.h ('k') | chrome/browser/resources/chromeos/arc_support/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698