Commit 264fc5fe authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Don't compile Windows chrome_cleaner prompt code on other OSes

srt_chrome_prompt_impl.cc is code that is only used in Windows
but was compiled for all operating systems. Since it uses constants
that only exist in Windows it's kind of lucky that it doesn't
cause any problems, except in some jumbo build experiments where
there was linker errors.

(TBR for name change in BUILD.gn)
TBR=nparker@chromium.org

Bug: 904958
Change-Id: If1e3f76c7bc913d4041d0cb38b4891d898d24506
Reviewed-on: https://chromium-review.googlesource.com/c/1350870Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarJoe Mason <joenotcharles@google.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#616067}
parent 271975a1
...@@ -42,14 +42,14 @@ static_library("safe_browsing") { ...@@ -42,14 +42,14 @@ static_library("safe_browsing") {
"chrome_cleaner/chrome_cleaner_reboot_dialog_controller_win.h", "chrome_cleaner/chrome_cleaner_reboot_dialog_controller_win.h",
"chrome_cleaner/chrome_cleaner_runner_win.cc", "chrome_cleaner/chrome_cleaner_runner_win.cc",
"chrome_cleaner/chrome_cleaner_runner_win.h", "chrome_cleaner/chrome_cleaner_runner_win.h",
"chrome_cleaner/chrome_cleaner_scanner_results.cc", "chrome_cleaner/chrome_cleaner_scanner_results_win.cc",
"chrome_cleaner/chrome_cleaner_scanner_results.h", "chrome_cleaner/chrome_cleaner_scanner_results_win.h",
"chrome_cleaner/reporter_runner_win.cc", "chrome_cleaner/reporter_runner_win.cc",
"chrome_cleaner/reporter_runner_win.h", "chrome_cleaner/reporter_runner_win.h",
"chrome_cleaner/settings_resetter_win.cc", "chrome_cleaner/settings_resetter_win.cc",
"chrome_cleaner/settings_resetter_win.h", "chrome_cleaner/settings_resetter_win.h",
"chrome_cleaner/srt_chrome_prompt_impl.cc", "chrome_cleaner/srt_chrome_prompt_impl_win.cc",
"chrome_cleaner/srt_chrome_prompt_impl.h", "chrome_cleaner/srt_chrome_prompt_impl_win.h",
"chrome_cleaner/srt_client_info_win.cc", "chrome_cleaner/srt_client_info_win.cc",
"chrome_cleaner/srt_client_info_win.h", "chrome_cleaner/srt_client_info_win.h",
"chrome_cleaner/srt_field_trial_win.cc", "chrome_cleaner/srt_field_trial_win.cc",
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "base/observer_list.h" #include "base/observer_list.h"
#include "base/threading/thread_checker.h" #include "base/threading/thread_checker.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h"
#include "components/component_updater/component_updater_service.h" #include "components/component_updater/component_updater_service.h"
namespace safe_browsing { namespace safe_browsing {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h"
#include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h" #include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "base/process/process.h" #include "base/process/process.h"
#include "base/sequenced_task_runner.h" #include "base/sequenced_task_runner.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/srt_chrome_prompt_impl.h" #include "chrome/browser/safe_browsing/chrome_cleaner/srt_chrome_prompt_impl_win.h"
#include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h" #include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "extensions/browser/extension_system.h" #include "extensions/browser/extension_system.h"
......
...@@ -257,8 +257,8 @@ class ChromeCleanerRunnerTest ...@@ -257,8 +257,8 @@ class ChromeCleanerRunnerTest
~ChromeCleanerRunnerTest() override {} ~ChromeCleanerRunnerTest() override {}
void SetUp() override { void SetUp() override {
// Set up the testing profile, so chrome_cleaner_scanner_results can get the // Set up the testing profile, so chrome_cleaner_scanner_results_win can get
// extensions registry from it. // the extensions registry from it.
ASSERT_TRUE(profile_manager_.SetUp()); ASSERT_TRUE(profile_manager_.SetUp());
testing_profile_ = profile_manager_.CreateTestingProfile("Profile 1"); testing_profile_ = profile_manager_.CreateTestingProfile("Profile 1");
MockChromeCleanerProcess::AddMockExtensionsToProfile(testing_profile_); MockChromeCleanerProcess::AddMockExtensionsToProfile(testing_profile_);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_extension_util_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_extension_util_win.h"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_SCANNER_RESULTS_H_ #ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_SCANNER_RESULTS_WIN_H_
#define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_SCANNER_RESULTS_H_ #define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_SCANNER_RESULTS_WIN_H_
#include <set> #include <set>
...@@ -49,4 +49,4 @@ class ChromeCleanerScannerResults { ...@@ -49,4 +49,4 @@ class ChromeCleanerScannerResults {
} // namespace safe_browsing } // namespace safe_browsing
#endif // CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_SCANNER_RESULTS_H_ #endif // CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_SCANNER_RESULTS_WIN_H_
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/safe_browsing/chrome_cleaner/srt_chrome_prompt_impl.h" #include "chrome/browser/safe_browsing/chrome_cleaner/srt_chrome_prompt_impl_win.h"
#include <algorithm> #include <algorithm>
#include <string> #include <string>
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_CHROME_PROMPT_IMPL_H_ #ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_CHROME_PROMPT_IMPL_WIN_H_
#define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_CHROME_PROMPT_IMPL_H_ #define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_CHROME_PROMPT_IMPL_WIN_H_
#include <memory> #include <memory>
#include <set> #include <set>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/optional.h" #include "base/optional.h"
#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h"
#include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h" #include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
...@@ -57,4 +57,4 @@ class ChromePromptImpl : public chrome_cleaner::mojom::ChromePrompt { ...@@ -57,4 +57,4 @@ class ChromePromptImpl : public chrome_cleaner::mojom::ChromePrompt {
} // namespace safe_browsing } // namespace safe_browsing
#endif // CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_CHROME_PROMPT_IMPL_H_ #endif // CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_CHROME_PROMPT_IMPL_WIN_H_
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/safe_browsing/chrome_cleaner/srt_chrome_prompt_impl.h" #include "chrome/browser/safe_browsing/chrome_cleaner/srt_chrome_prompt_impl_win.h"
#include <vector> #include <vector>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h"
#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
#include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_change_registrar.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment