diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chrome_browser_main_linux.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chrome_browser_main_linux.h | 4 | ||||
| -rw-r--r-- | chrome/browser/media_gallery/media_device_notifications_linux.h | 4 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 11 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 |
5 files changed, 22 insertions, 5 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index c28daa4..577d9ce 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -4,7 +4,9 @@ #include "chrome/browser/chrome_browser_main_linux.h" +#if !defined(OS_CHROMEOS) #include "chrome/browser/media_gallery/media_device_notifications_linux.h" +#endif #if defined(USE_LINUX_BREAKPAD) #include <stdlib.h> @@ -87,10 +89,12 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { InitCrashReporter(); #endif +#if !defined(OS_CHROMEOS) const FilePath kDefaultMtabPath("/etc/mtab"); media_device_notifications_linux_ = new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath); media_device_notifications_linux_->Init(); +#endif ChromeBrowserMainPartsPosix::PreProfileInit(); } diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h index 6dd5093..531f6c036 100644 --- a/chrome/browser/chrome_browser_main_linux.h +++ b/chrome/browser/chrome_browser_main_linux.h @@ -12,9 +12,11 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/chrome_browser_main_posix.h" +#if !defined(OS_CHROMEOS) namespace chrome { class MediaDeviceNotificationsLinux; } +#endif class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix { public: @@ -26,8 +28,10 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix { virtual void PreProfileInit() OVERRIDE; private: +#if !defined(OS_CHROMEOS) scoped_refptr<chrome::MediaDeviceNotificationsLinux> media_device_notifications_linux_; +#endif DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux); }; diff --git a/chrome/browser/media_gallery/media_device_notifications_linux.h b/chrome/browser/media_gallery/media_device_notifications_linux.h index 3e83671..2d42900 100644 --- a/chrome/browser/media_gallery/media_device_notifications_linux.h +++ b/chrome/browser/media_gallery/media_device_notifications_linux.h @@ -9,6 +9,10 @@ #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_ #pragma once +#if defined(OS_CHROMEOS) +#error "Use the ChromeOS-specific implementation instead." +#endif + #include <map> #include <set> #include <string> diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 274c398..bb5ea2b 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3202,14 +3202,14 @@ 'browser/ui/panels/panel_browser_window_cocoa.mm', 'browser/ui/panels/panel_browser_window_gtk.cc', 'browser/ui/panels/panel_browser_window_gtk.h', - 'browser/ui/panels/panel_cocoa.h', - 'browser/ui/panels/panel_cocoa.mm', + 'browser/ui/panels/panel_cocoa.h', + 'browser/ui/panels/panel_cocoa.mm', 'browser/ui/panels/panel_constants.h', 'browser/ui/panels/panel_drag_controller.cc', 'browser/ui/panels/panel_drag_controller.h', 'browser/ui/panels/panel_drag_gtk.cc', 'browser/ui/panels/panel_drag_gtk.h', - 'browser/ui/panels/panel_gtk.cc', + 'browser/ui/panels/panel_gtk.cc', 'browser/ui/panels/panel_resize_controller.cc', 'browser/ui/panels/panel_resize_controller.h', 'browser/ui/panels/panel_manager.cc', @@ -3224,7 +3224,7 @@ 'browser/ui/panels/panel_titlebar_view_cocoa.mm', 'browser/ui/panels/panel_utils_cocoa.h', 'browser/ui/panels/panel_utils_cocoa.mm', - 'browser/ui/panels/panel_view.cc', + 'browser/ui/panels/panel_view.cc', 'browser/ui/panels/panel_window_controller_cocoa.h', 'browser/ui/panels/panel_window_controller_cocoa.mm', 'browser/ui/panels/taskbar_window_thumbnailer_win.cc', @@ -4402,6 +4402,9 @@ ['exclude', 'browser/icon_loader_linux.cc'], ['exclude', 'browser/icon_manager_linux.cc'], ['exclude', 'browser/idle_linux.cc'], + ['exclude', 'browser/media_gallery/media_device_notifications_linux.cc'], + ['exclude', 'browser/media_gallery/media_device_notifications_linux.h'], + ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'], ['exclude', 'browser/password_manager/native_backend_gnome_x.h'], ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 3b8c384..4bc8331 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1763,7 +1763,7 @@ 'browser/ui/omnibox/omnibox_view_unittest.cc', 'browser/ui/panels/display_settings_provider_win_unittest.cc', 'browser/ui/panels/panel_browser_window_cocoa_unittest.mm', - 'browser/ui/panels/panel_cocoa_unittest.mm', + 'browser/ui/panels/panel_cocoa_unittest.mm', 'browser/ui/panels/panel_mouse_watcher_unittest.cc', 'browser/ui/search_engines/keyword_editor_controller_unittest.cc', 'browser/ui/select_file_dialog_unittest.cc', @@ -2133,6 +2133,8 @@ }], ['chromeos==1', { 'sources/': [ + ['exclude', '^browser/media_gallery/media_device_notifications_linux_unittest.cc'], + ['exclude', '^browser/password_manager/native_backend_gnome_x_unittest.cc'], ['exclude', '^browser/password_manager/native_backend_kwallet_x_unittest.cc'], ['exclude', '^browser/safe_browsing/download_protection_service_unittest.cc' ], |