Chrome Cleaner UI: Add logs upload permission checkbox to the dialog

chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_CONTROLLER_WIN_H_
 #define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_CONTROLLER_WIN_H_
 
 #include <memory>
 #include <set>
 #include <vector>
@@ skipping 73 matching lines @@
     kInitial,
     kScanningFoundNothing,
     kScanningFailed,
     kConnectionLost,
     kUserDeclinedCleanup,
     kCleaningFailed,
     kCleaningSucceeded,
   };
 
   enum class UserResponse {
-    // User accepted the cleanup operation.
-    kAccepted,
+    // User accepted the cleanup operation and logs upload is enabled.
+    kAcceptedWithLogs,
+    // User accepted the cleanup operation and logs upload is not enabled.
+    kAcceptedWithoutLogs,
     // User explicitly denied the cleanup operation, for example by clicking the
     // Cleaner dialog's cancel button.
     kDenied,
     // The cleanup operation was denied when the user dismissed the Cleaner
     // dialog, for example by pressing the ESC key.
     kDismissed,
   };
 
   class Observer {
    public:
     virtual void OnIdle(IdleReason idle_reason) {}
     virtual void OnScanning() {}
     virtual void OnInfected(const std::set<base::FilePath>& files_to_delete) {}
     virtual void OnCleaning(const std::set<base::FilePath>& files_to_delete) {}
     virtual void OnRebootRequired() {}
     virtual void OnRebootFailed() {}
+    virtual void OnLogsEnabledChanged(bool logs_enabled) {}
 
    protected:
     virtual ~Observer() = default;
   };
 
   // Returns the global controller object.
   static ChromeCleanerController* GetInstance();
 
   // Returns whether the Cleanup card in settings should be displayed.
   // Static to prevent instantiation of the global controller object.
   static bool ShouldShowCleanupInSettingsUI();
 
   State state() const { return state_; }
 
+  // Called by Chrome Cleaner's UI when the user changes Cleaner logs upload
+  // permissions. Observers are notified if |logs_enabled| is different from the
+  // current permission state.
+  void SetLogsEnabled(bool logs_enabled);
+  bool logs_enabled() const { return logs_enabled_; }
+
   // |AddObserver()| immediately notifies |observer| of the controller's state
   // by calling the corresponding |On*()| function.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Downloads the Chrome Cleaner binary, executes it and waits for the Cleaner
   // to communicate with Chrome about harmful software found on the
   // system. During this time, the controller will be in the kScanning state. If
   // any of the steps fail or if the Cleaner does not find harmful software on
   // the system, the controller will transition to the kIdle state, passing to
@@ skipping 73 matching lines @@
   void InitiateReboot();
 
   // Invoked once settings reset is done for tagged profiles.
   void OnSettingsResetCompleted();
 
   std::unique_ptr<ChromeCleanerControllerDelegate> real_delegate_;
   // Pointer to either real_delegate_ or one set by tests.
   ChromeCleanerControllerDelegate* delegate_;
 
   State state_ = State::kIdle;
+  // The logs permission checkboxes in the Chrome Clenaer dialog and webui page

[robertshield, 2017/06/29 13:47:21]

nit: Cleaner

[proberge, 2017/06/29 13:55:52]

s/Clenaer/Cleaner

[alito, 2017/06/29 17:14:27]

Done.

[alito, 2017/06/29 17:14:27]

Done.

+  // are meant to be checked by default.

[proberge, 2017/06/29 13:55:52]

s/meant to be checked by default/opt out

[alito, 2017/06/29 17:14:27]

Ah, thx. That's what I couldn't remember last night :)

+  bool logs_enabled_ = true;
   IdleReason idle_reason_ = IdleReason::kInitial;
   std::unique_ptr<SwReporterInvocation> reporter_invocation_;
   std::unique_ptr<std::set<base::FilePath>> files_to_delete_;
   // The Mojo callback that should be called to send a response to the Chrome
   // Cleaner process. This must be posted to run on the IO thread.
   chrome_cleaner::mojom::ChromePrompt::PromptUserCallback prompt_user_callback_;
 
   base::ObserverList<Observer> observer_list_;
 
   THREAD_CHECKER(thread_checker_);
 
   base::WeakPtrFactory<ChromeCleanerController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeCleanerController);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_CONTROLLER_WIN_H_