diff options
| -rw-r--r-- | chrome/browser/icon_manager_linux.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc (renamed from chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc) | 0 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/advanced_options_utils_x11.cc (renamed from chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc) | 0 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/font_settings_utils_x11.cc (renamed from chrome/browser/ui/webui/options/font_settings_utils_gtk.cc) | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 12 | ||||
| -rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_aura.cc | 6 |
6 files changed, 19 insertions, 8 deletions
diff --git a/chrome/browser/icon_manager_linux.cc b/chrome/browser/icon_manager_linux.cc index 53fd124..930320e 100644 --- a/chrome/browser/icon_manager_linux.cc +++ b/chrome/browser/icon_manager_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,6 +8,10 @@ #include "base/threading/thread_restrictions.h" IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { +#if defined(USE_AURA) + // TODO(davemoore) Implement this for aura. + return std::string(); +#else // It turns out the call to mime_util::GetFileMimeType below does IO, but // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows // and Mac implementations do not). We should fix this by either not doing IO @@ -16,4 +20,5 @@ IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { base::ThreadRestrictions::ScopedAllowIO allow_io; return mime_util::GetFileMimeType(filepath); +#endif } diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc index 8380adb..8380adb 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index e62eae4..e62eae4 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc diff --git a/chrome/browser/ui/webui/options/font_settings_utils_gtk.cc b/chrome/browser/ui/webui/options/font_settings_utils_x11.cc index 022fc88..f383676 100644 --- a/chrome/browser/ui/webui/options/font_settings_utils_gtk.cc +++ b/chrome/browser/ui/webui/options/font_settings_utils_x11.cc @@ -6,5 +6,5 @@ // static void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) { - // Nothing to do for GTK. + // Nothing to do for X11. } diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 790b55d..db7722f 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3310,8 +3310,8 @@ 'browser/ui/views/frame/browser_frame_win.cc', 'browser/ui/views/frame/browser_frame_win.h', 'browser/ui/views/frame/browser_non_client_frame_view.h', - 'browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc', 'browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc', + 'browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc', 'browser/ui/views/frame/browser_root_view.cc', 'browser/ui/views/frame/browser_root_view.h', 'browser/ui/views/frame/browser_view.cc', @@ -3682,9 +3682,9 @@ 'browser/ui/webui/options/advanced_options_handler.cc', 'browser/ui/webui/options/advanced_options_handler.h', 'browser/ui/webui/options/advanced_options_utils.h', - 'browser/ui/webui/options/advanced_options_utils_gtk.cc', 'browser/ui/webui/options/advanced_options_utils_mac.mm', 'browser/ui/webui/options/advanced_options_utils_win.cc', + 'browser/ui/webui/options/advanced_options_utils_x11.cc', 'browser/ui/webui/options/autofill_options_handler.cc', 'browser/ui/webui/options/autofill_options_handler.h', 'browser/ui/webui/options/browser_options_handler.cc', @@ -3742,9 +3742,9 @@ 'browser/ui/webui/options/font_settings_handler.cc', 'browser/ui/webui/options/font_settings_handler.h', 'browser/ui/webui/options/font_settings_utils.h', - 'browser/ui/webui/options/font_settings_utils_gtk.cc', 'browser/ui/webui/options/font_settings_utils_mac.mm', 'browser/ui/webui/options/font_settings_utils_win.cc', + 'browser/ui/webui/options/font_settings_utils_x11.cc', 'browser/ui/webui/options/handler_options_handler.cc', 'browser/ui/webui/options/handler_options_handler.h', 'browser/ui/webui/options/import_data_handler.cc', @@ -4048,7 +4048,7 @@ ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc'], ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'], ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], - ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'], + ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'], ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'], ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.*'], ['exclude', '^browser/chromeos/input_method/candidate_window.cc'], @@ -4814,7 +4814,7 @@ ['include', '^browser/ui/gtk/dialogs_kde.cc'], ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.cc'], ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.h'], - ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'], + ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'], ['include', '^browser/ui/views/notifications/balloon_view.cc'], ['include', '^browser/ui/views/notifications/balloon_view.h'], ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'], @@ -4884,7 +4884,7 @@ ['exclude', '^browser/ui/gtk/ssl_client_certificate_selector.cc'], ['exclude', '^browser/ui/login/login_prompt_gtk.cc'], ['exclude', '^browser/ui/views/constrained_html_delegate_gtk.cc'], - ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'], + ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'], ['exclude', '^browser/ui/views/tabs/tab_strip_factory.cc'], ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.*'], ], diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc index 78d5a9d..18b4128 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc @@ -68,4 +68,10 @@ OSExchangeData::Provider* OSExchangeData::CreateProvider() { return new OSExchangeDataProviderAura(); } +// static +void* OSExchangeData::RegisterCustomFormat(const std::string& type) { + // TODO(davemoore) Implement this for aura. + return NULL; +} + } // namespace ui |