Commit 6a65281f authored by Tomasz Moniuszko's avatar Tomasz Moniuszko Committed by Commit Bot

Stop compiling ColorChooserAura on Windows

It's not used on Windows anyway as there's platform-specific
implementation in chrome/browser/ui/views/color_chooser_win.cc.

Change-Id: Ic799890799f70141ae1e245e3a62df5cf707947c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108141Reviewed-by: default avatarDana Fried <dfried@chromium.org>
Commit-Queue: Tomasz Moniuszko <tmoniuszko@opera.com>
Cr-Commit-Position: refs/heads/master@{#752396}
parent d90602b5
...@@ -3650,8 +3650,6 @@ jumbo_static_library("ui") { ...@@ -3650,8 +3650,6 @@ jumbo_static_library("ui") {
"views/apps/glass_app_window_frame_view_win.h", "views/apps/glass_app_window_frame_view_win.h",
"views/apps/shaped_app_window_targeter.cc", "views/apps/shaped_app_window_targeter.cc",
"views/apps/shaped_app_window_targeter.h", "views/apps/shaped_app_window_targeter.h",
"views/color_chooser_aura.cc",
"views/color_chooser_aura.h",
"views/dropdown_bar_host_aura.cc", "views/dropdown_bar_host_aura.cc",
"views/frame/browser_non_client_frame_view_factory_chromeos.cc", "views/frame/browser_non_client_frame_view_factory_chromeos.cc",
"views/ime/ime_window_frame_view.cc", "views/ime/ime_window_frame_view.cc",
...@@ -3678,6 +3676,13 @@ jumbo_static_library("ui") { ...@@ -3678,6 +3676,13 @@ jumbo_static_library("ui") {
"views/frame/desktop_browser_frame_aura.h", "views/frame/desktop_browser_frame_aura.h",
] ]
} }
if (!is_win) {
sources += [
"views/color_chooser_aura.cc",
"views/color_chooser_aura.h",
]
}
} }
if (is_chromeos) { if (is_chromeos) {
......
...@@ -58,7 +58,6 @@ ColorChooserAura* ColorChooserAura::Open( ...@@ -58,7 +58,6 @@ ColorChooserAura* ColorChooserAura::Open(
return new ColorChooserAura(web_contents, initial_color); return new ColorChooserAura(web_contents, initial_color);
} }
#if !defined(OS_WIN)
namespace chrome { namespace chrome {
content::ColorChooser* ShowColorChooser(content::WebContents* web_contents, content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
...@@ -67,4 +66,3 @@ content::ColorChooser* ShowColorChooser(content::WebContents* web_contents, ...@@ -67,4 +66,3 @@ content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
} }
} // namespace chrome } // namespace chrome
#endif // OS_WIN
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