diff options
22 files changed, 40 insertions, 42 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index ce7a52c..1df60b6 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -34,7 +34,6 @@ #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" -#include "chrome/browser/renderer_host/text_input_client_message_filter.h" #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h" #include "chrome/browser/speech/chrome_speech_input_manager.h" #include "chrome/browser/spellchecker/spellcheck_message_filter.h" @@ -173,9 +172,6 @@ void ChromeContentBrowserClient::BrowserRenderProcessHostCreated( host->channel()->AddFilter( new SearchProviderInstallStateMessageFilter(id, profile)); host->channel()->AddFilter(new SpellCheckMessageFilter(id)); -#if defined(OS_MACOSX) - host->channel()->AddFilter(new TextInputClientMessageFilter(host->id())); -#endif host->Send(new ChromeViewMsg_SetIsIncognitoProcess( profile->IsOffTheRecord())); diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 5d095db..dcc3988 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -20,7 +20,6 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/mac/closure_blocks_leopard_compat.h" #import "chrome/browser/renderer_host/accelerated_plugin_view_mac.h" -#import "chrome/browser/renderer_host/text_input_client_mac.h" #include "chrome/browser/spellchecker/spellchecker_platform_engine.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -40,6 +39,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_observer.h" #include "content/browser/renderer_host/render_widget_host.h" +#import "content/browser/renderer_host/text_input_client_mac.h" #include "content/common/edit_command.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/native_web_keyboard_event.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 6bc5646..904bbee 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1908,10 +1908,6 @@ 'browser/renderer_host/render_widget_host_view_views_win.cc', 'browser/renderer_host/safe_browsing_resource_handler.cc', 'browser/renderer_host/safe_browsing_resource_handler.h', - 'browser/renderer_host/text_input_client_mac.h', - 'browser/renderer_host/text_input_client_mac.mm', - 'browser/renderer_host/text_input_client_message_filter.h', - 'browser/renderer_host/text_input_client_message_filter.mm', 'browser/renderer_host/web_cache_manager.cc', 'browser/renderer_host/web_cache_manager.h', 'browser/renderer_preferences_util.cc', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 6ebc25b..ab91337 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -235,7 +235,6 @@ 'common/spellcheck_common.cc', 'common/spellcheck_common.h', 'common/spellcheck_messages.h', - 'common/text_input_client_messages.h', 'common/thumbnail_score.cc', 'common/thumbnail_score.h', 'common/url_constants.cc', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 3e80022..8f63b70 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -170,8 +170,6 @@ 'renderer/spellchecker/spellcheck_worditerator.h', 'renderer/translate_helper.cc', 'renderer/translate_helper.h', - 'renderer/text_input_client_observer.cc', - 'renderer/text_input_client_observer.h', 'renderer/visitedlink_slave.cc', 'renderer/visitedlink_slave.h', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 74ad1bf..1096d6e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1427,7 +1427,6 @@ 'browser/remoting/firewall_traversal_observer_unittest.cc', 'browser/renderer_host/accelerated_plugin_view_mac_unittest.mm', 'browser/renderer_host/render_widget_host_view_mac_unittest.mm', - 'browser/renderer_host/text_input_client_mac_unittest.mm', 'browser/renderer_host/web_cache_manager_unittest.cc', 'browser/resources_util_unittest.cc', 'browser/rlz/rlz_unittest.cc', @@ -1837,6 +1836,7 @@ '../content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc', '../content/browser/renderer_host/render_view_host_unittest.cc', '../content/browser/renderer_host/render_widget_host_unittest.cc', + '../content/browser/renderer_host/text_input_client_mac_unittest.mm', '../content/browser/site_instance_unittest.cc', '../content/browser/tab_contents/navigation_controller_unittest.cc', '../content/browser/tab_contents/render_view_host_manager_unittest.cc', diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h index 09dde68..44128db 100644 --- a/chrome/common/common_message_generator.h +++ b/chrome/common/common_message_generator.h @@ -14,5 +14,4 @@ #include "chrome/common/safe_browsing/safebrowsing_messages.h" #include "chrome/common/service_messages.h" #include "chrome/common/spellcheck_messages.h" -#include "chrome/common/text_input_client_messages.h" diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 7becf4a..7e4e08d 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -57,7 +57,6 @@ #include "chrome/renderer/searchbox_extension.h" #include "chrome/renderer/spellchecker/spellcheck.h" #include "chrome/renderer/spellchecker/spellcheck_provider.h" -#include "chrome/renderer/text_input_client_observer.h" #include "chrome/renderer/translate_helper.h" #include "chrome/renderer/visitedlink_slave.h" #include "content/common/view_messages.h" @@ -226,10 +225,6 @@ void ChromeContentRendererClient::RenderViewCreated(RenderView* render_view) { safe_browsing::MalwareDOMDetails::Create(render_view); #endif -#if defined(OS_MACOSX) - new TextInputClientObserver(render_view); -#endif // defined(OS_MACOSX) - PasswordAutofillManager* password_autofill_manager = new PasswordAutofillManager(render_view); AutofillAgent* autofill_agent = new AutofillAgent(render_view, diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc index 1fe037d..3784d322 100644 --- a/content/browser/renderer_host/browser_render_process_host.cc +++ b/content/browser/renderer_host/browser_render_process_host.cc @@ -62,6 +62,7 @@ #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/resource_message_filter.h" #include "content/browser/renderer_host/socket_stream_dispatcher_host.h" +#include "content/browser/renderer_host/text_input_client_message_filter.h" #include "content/browser/resolve_proxy_msg_helper.h" #include "content/browser/speech/speech_input_dispatcher_host.h" #include "content/browser/trace_message_filter.h" @@ -394,6 +395,9 @@ void BrowserRenderProcessHost::CreateMessageFilters() { channel_->AddFilter(new MimeRegistryMessageFilter()); channel_->AddFilter(new DatabaseMessageFilter( browser_context()->GetDatabaseTracker())); +#if defined(OS_MACOSX) + channel_->AddFilter(new TextInputClientMessageFilter(id())); +#endif SocketStreamDispatcherHost* socket_stream_dispatcher_host = new SocketStreamDispatcherHost( diff --git a/chrome/browser/renderer_host/text_input_client_mac.h b/content/browser/renderer_host/text_input_client_mac.h index 00c2e29..00c67b8 100644 --- a/chrome/browser/renderer_host/text_input_client_mac.h +++ b/content/browser/renderer_host/text_input_client_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ -#define CHROME_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ +#ifndef CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ +#define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ #import <Cocoa/Cocoa.h> @@ -83,4 +83,4 @@ class TextInputClientMac { DISALLOW_COPY_AND_ASSIGN(TextInputClientMac); }; -#endif // CHROME_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ +#endif // CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ diff --git a/chrome/browser/renderer_host/text_input_client_mac.mm b/content/browser/renderer_host/text_input_client_mac.mm index a8f7c75..b65c854 100644 --- a/chrome/browser/renderer_host/text_input_client_mac.mm +++ b/content/browser/renderer_host/text_input_client_mac.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/renderer_host/text_input_client_mac.h" +#import "content/browser/renderer_host/text_input_client_mac.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" #include "base/time.h" -#include "chrome/common/text_input_client_messages.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/common/text_input_client_messages.h" // The amount of time in milliseconds that the browser process will wait for a // response from the renderer. @@ -79,7 +79,6 @@ NSAttributedString* TextInputClientMac::GetAttributedSubstringFromRange( UMA_HISTOGRAM_TIMES("TextInputClient.Substring", delta * base::Time::kMicrosecondsPerMillisecond); - // Lookup.framework calls this method repeatedly and expects that repeated // calls don't deallocate previous results immediately. Returning an // autoreleased string is better convention anyway. diff --git a/chrome/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm index 2ea2735..58552d6 100644 --- a/chrome/browser/renderer_host/text_input_client_mac_unittest.mm +++ b/content/browser/renderer_host/text_input_client_mac_unittest.mm @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/renderer_host/text_input_client_mac.h" +#import "content/browser/renderer_host/text_input_client_mac.h" #include "base/bind.h" #include "base/message_loop.h" #include "base/threading/thread.h" -#include "chrome/browser/renderer_host/text_input_client_message_filter.h" -#include "chrome/common/text_input_client_messages.h" #include "chrome/test/base/testing_profile.h" #include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/browser/renderer_host/text_input_client_message_filter.h" +#include "content/common/text_input_client_messages.h" #include "ipc/ipc_test_sink.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" diff --git a/chrome/browser/renderer_host/text_input_client_message_filter.h b/content/browser/renderer_host/text_input_client_message_filter.h index 384b37a..2f85140 100644 --- a/chrome/browser/renderer_host/text_input_client_message_filter.h +++ b/content/browser/renderer_host/text_input_client_message_filter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MESSAGE_FILTER_H_ -#define CHROME_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MESSAGE_FILTER_H_ +#ifndef CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MESSAGE_FILTER_H_ +#define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MESSAGE_FILTER_H_ #pragma once #include "content/browser/browser_message_filter.h" @@ -19,7 +19,7 @@ class Range; // This is a browser-side message filter that lives on the IO thread to handle // replies to messages sent by the TextInputClientMac. See -// chrome/browser/renderer_host/text_input_client_mac.h for more information. +// content/browser/renderer_host/text_input_client_mac.h for more information. class TextInputClientMessageFilter : public BrowserMessageFilter { public: explicit TextInputClientMessageFilter(int child_id); @@ -42,4 +42,4 @@ class TextInputClientMessageFilter : public BrowserMessageFilter { DISALLOW_COPY_AND_ASSIGN(TextInputClientMessageFilter); }; -#endif // CHROME_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MESSAGE_FILTER_H_ +#endif // CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MESSAGE_FILTER_H_ diff --git a/chrome/browser/renderer_host/text_input_client_message_filter.mm b/content/browser/renderer_host/text_input_client_message_filter.mm index fa7a10f..927a714 100644 --- a/chrome/browser/renderer_host/text_input_client_message_filter.mm +++ b/content/browser/renderer_host/text_input_client_message_filter.mm @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/renderer_host/text_input_client_message_filter.h" +#include "content/browser/renderer_host/text_input_client_message_filter.h" #include "base/memory/scoped_nsobject.h" #include "base/string16.h" -#include "chrome/browser/renderer_host/text_input_client_mac.h" -#include "chrome/common/text_input_client_messages.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" +#include "content/browser/renderer_host/text_input_client_mac.h" +#include "content/common/text_input_client_messages.h" #include "ipc/ipc_message_macros.h" #include "ui/base/range/range.h" #include "ui/gfx/rect.h" @@ -42,7 +42,7 @@ bool TextInputClientMessageFilter::OnMessageReceived( void TextInputClientMessageFilter::OnGotCharacterIndexForPoint(size_t index) { TextInputClientMac* service = TextInputClientMac::GetInstance(); - // |index| could be WTF::notFound (-1) and it's value is different from + // |index| could be WTF::notFound (-1) and its value is different from // NSNotFound so we need to convert it. if (index == static_cast<size_t>(-1)) { index = NSNotFound; diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h index 618da95..c34cfcb 100644 --- a/content/common/content_message_generator.h +++ b/content/common/content_message_generator.h @@ -33,6 +33,7 @@ #include "content/common/resource_messages.h" #include "content/common/speech_input_messages.h" #include "content/common/socket_stream_messages.h" +#include "content/common/text_input_client_messages.h" #include "content/common/utility_messages.h" #include "content/common/view_messages.h" #include "content/common/webblob_messages.h" diff --git a/chrome/common/text_input_client_messages.h b/content/common/text_input_client_messages.h index c42a32a..c42a32a 100644 --- a/chrome/common/text_input_client_messages.h +++ b/content/common/text_input_client_messages.h diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 7700d44..fda1259 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -425,6 +425,10 @@ 'browser/renderer_host/socket_stream_host.h', 'browser/renderer_host/sync_resource_handler.cc', 'browser/renderer_host/sync_resource_handler.h', + 'browser/renderer_host/text_input_client_mac.h', + 'browser/renderer_host/text_input_client_mac.mm', + 'browser/renderer_host/text_input_client_message_filter.h', + 'browser/renderer_host/text_input_client_message_filter.mm', 'browser/renderer_host/x509_user_cert_resource_handler.cc', 'browser/renderer_host/x509_user_cert_resource_handler.h', 'browser/resolve_proxy_msg_helper.cc', diff --git a/content/content_common.gypi b/content/content_common.gypi index 2efc679..5623da2 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -231,6 +231,7 @@ 'common/speech_input_result.h', 'common/swapped_out_messages.cc', 'common/swapped_out_messages.h', + 'common/text_input_client_messages.h', 'common/unix_domain_socket_posix.cc', 'common/unix_domain_socket_posix.h', 'common/url_constants.cc', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index c1ad628..bdfeb51 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -162,6 +162,8 @@ 'renderer/renderer_webstoragenamespace_impl.h', 'renderer/speech_input_dispatcher.cc', 'renderer/speech_input_dispatcher.h', + 'renderer/text_input_client_observer.cc', + 'renderer/text_input_client_observer.h', 'renderer/v8_value_converter.cc', 'renderer/v8_value_converter.h', 'renderer/webplugin_delegate_proxy.cc', diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index de09b3e..9101110 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -65,6 +65,7 @@ #include "content/renderer/renderer_webapplicationcachehost_impl.h" #include "content/renderer/renderer_webstoragenamespace_impl.h" #include "content/renderer/speech_input_dispatcher.h" +#include "content/renderer/text_input_client_observer.h" #include "content/renderer/v8_value_converter.h" #include "content/renderer/web_ui_bindings.h" #include "content/renderer/webplugin_delegate_proxy.h" @@ -443,6 +444,9 @@ RenderView::RenderView(RenderThreadBase* render_thread, #endif new MHTMLGenerator(this); +#if defined(OS_MACOSX) + new TextInputClientObserver(this); +#endif // defined(OS_MACOSX) devtools_agent_ = new DevToolsAgent(this); diff --git a/chrome/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc index 2102267..f89623c 100644 --- a/chrome/renderer/text_input_client_observer.cc +++ b/content/renderer/text_input_client_observer.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/text_input_client_observer.h" +#include "content/renderer/text_input_client_observer.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/text_input_client_messages.h" +#include "content/common/text_input_client_messages.h" #include "content/renderer/render_view.h" #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSubstringUtil.h" diff --git a/chrome/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h index bbd265a..7cd1fc1 100644 --- a/chrome/renderer/text_input_client_observer.h +++ b/content/renderer/text_input_client_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ -#define CHROME_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ +#ifndef CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ +#define CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ #include "base/basictypes.h" #include "build/build_config.h" @@ -17,7 +17,7 @@ class WebView; // This is the renderer-side message filter that generates the replies for the // messages sent by the TextInputClientMac. See -// chrome/browser/renderer_host/text_input_client_mac.h for more information. +// content/browser/renderer_host/text_input_client_mac.h for more information. class TextInputClientObserver : public RenderViewObserver { public: explicit TextInputClientObserver(RenderView* render_view); @@ -38,4 +38,4 @@ class TextInputClientObserver : public RenderViewObserver { DISALLOW_COPY_AND_ASSIGN(TextInputClientObserver); }; -#endif // CHROME_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ +#endif // CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ |