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

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

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)
Patch Set: cleanup Created 4 years 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 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_
6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_ 6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 void OnDisplayAdded(const display::Display& new_display) override; 118 void OnDisplayAdded(const display::Display& new_display) override;
119 void OnDisplayRemoved(const display::Display& old_display) override; 119 void OnDisplayRemoved(const display::Display& old_display) override;
120 void OnDisplayMetricsChanged(const display::Display& display, 120 void OnDisplayMetricsChanged(const display::Display& display,
121 uint32_t changed_metrics) override; 121 uint32_t changed_metrics) override;
122 122
123 // Returns current page that has to be shown in OptIn UI. 123 // Returns current page that has to be shown in OptIn UI.
124 // Note that this can be inconsistent from the actually shown page. 124 // Note that this can be inconsistent from the actually shown page.
125 // TODO(hidehiko): Remove this exposure. 125 // TODO(hidehiko): Remove this exposure.
126 UIPage ui_page() const { return ui_page_; } 126 UIPage ui_page() const { return ui_page_; }
127 127
128 // Returns true if message host is currently attached which means UI is shown.
129 bool has_message_host() const { return message_host_; }
hidehiko 2016/12/16 05:31:50 Please do not expose anything about related to mes
khmel 2016/12/16 18:37:55 It is needed, please see void ArcSessionManager::O
hidehiko 2016/12/19 15:49:44 Oh I see. Then please use ui_page_, instead, for t
khmel 2016/12/19 17:48:10 I added parameter force_activate to ShowArcLoading
130
128 void SetRequestOpenAppCallbackForTesting( 131 void SetRequestOpenAppCallbackForTesting(
129 const RequestOpenAppCallback& callback); 132 const RequestOpenAppCallback& callback);
130 133
131 private: 134 private:
132 struct PreferenceCheckboxData { 135 struct PreferenceCheckboxData {
133 PreferenceCheckboxData() : PreferenceCheckboxData(false, false) {} 136 PreferenceCheckboxData() : PreferenceCheckboxData(false, false) {}
134 PreferenceCheckboxData(bool is_enabled, bool is_managed) 137 PreferenceCheckboxData(bool is_enabled, bool is_managed)
135 : is_enabled(is_enabled), is_managed(is_managed) {} 138 : is_enabled(is_enabled), is_managed(is_managed) {}
136 139
137 bool is_enabled; 140 bool is_enabled;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 bool is_arc_managed_ = false; 186 bool is_arc_managed_ = false;
184 187
185 PreferenceCheckboxData metrics_checkbox_; 188 PreferenceCheckboxData metrics_checkbox_;
186 PreferenceCheckboxData backup_and_restore_checkbox_; 189 PreferenceCheckboxData backup_and_restore_checkbox_;
187 PreferenceCheckboxData location_services_checkbox_; 190 PreferenceCheckboxData location_services_checkbox_;
188 191
189 DISALLOW_COPY_AND_ASSIGN(ArcSupportHost); 192 DISALLOW_COPY_AND_ASSIGN(ArcSupportHost);
190 }; 193 };
191 194
192 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_ 195 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698