Commit a3c084db authored by hshi@chromium.org's avatar hshi@chromium.org

Fix screen capture notification UI on Chrome OS.

The stub class should only be built for Android, not Chrome OS.

BUG=401791
TEST=verify that screen capture notification UI is shown on ChromeOS.
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/450023002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288174 0039d316-1c4b-4281-b951-d872f2087c98
parent 6bc03dea
...@@ -227,11 +227,6 @@ static_library("ui") { ...@@ -227,11 +227,6 @@ static_library("ui") {
sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources,
".", "//chrome") ".", "//chrome")
} }
if (is_chromeos || is_android) {
sources += rebase_path(
gypi_values.chrome_browser_ui_android_chromeos_sources,
".", "//chrome")
}
if (use_aura) { if (use_aura) {
sources += rebase_path(gypi_values.chrome_browser_ui_aura_sources, sources += rebase_path(gypi_values.chrome_browser_ui_aura_sources,
".", "//chrome") ".", "//chrome")
......
...@@ -1330,10 +1330,6 @@ ...@@ -1330,10 +1330,6 @@
'browser/ui/views/select_file_dialog_extension_factory.cc', 'browser/ui/views/select_file_dialog_extension_factory.cc',
'browser/ui/views/select_file_dialog_extension_factory.h', 'browser/ui/views/select_file_dialog_extension_factory.h',
], ],
# Files shared between CrOS and Android.
'chrome_browser_ui_android_chromeos_sources': [
'browser/ui/screen_capture_notification_ui_stub.cc',
],
# Used everwhere but ChromeOS. # Used everwhere but ChromeOS.
'chrome_browser_ui_non_chromeos_sources': [ 'chrome_browser_ui_non_chromeos_sources': [
'browser/ui/external_protocol_dialog_delegate.cc', 'browser/ui/external_protocol_dialog_delegate.cc',
...@@ -1348,6 +1344,7 @@ ...@@ -1348,6 +1344,7 @@
'chrome_browser_ui_android_sources': [ 'chrome_browser_ui_android_sources': [
'browser/ui/auto_login_infobar_delegate.cc', 'browser/ui/auto_login_infobar_delegate.cc',
'browser/ui/auto_login_infobar_delegate.h', 'browser/ui/auto_login_infobar_delegate.h',
'browser/ui/screen_capture_notification_ui_stub.cc',
], ],
'chrome_browser_ui_non_android_sources': [ 'chrome_browser_ui_non_android_sources': [
'browser/ui/apps/chrome_app_delegate.cc', 'browser/ui/apps/chrome_app_delegate.cc',
...@@ -2740,9 +2737,6 @@ ...@@ -2740,9 +2737,6 @@
['OS=="win" or OS=="mac" or desktop_linux==1', { ['OS=="win" or OS=="mac" or desktop_linux==1', {
'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
}], }],
['chromeos==1 or OS=="android"', {
'sources': [ '<@(chrome_browser_ui_android_chromeos_sources)' ],
}],
['use_aura==1', { ['use_aura==1', {
'sources': [ '<@(chrome_browser_ui_aura_sources)'] , 'sources': [ '<@(chrome_browser_ui_aura_sources)'] ,
'dependencies': [ 'dependencies': [
......
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