Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: chrome/browser/renderer_host/resource_message_filter.cc

Issue 3183013: [Mac] Don't close the Wrench menu after using the zoom buttons if the menu was opened sticky. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: nits Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/cocoa/wrench_menu_controller.mm ('k') | chrome/browser/ui_thread_helpers.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/resource_message_filter.h" 5 #include "chrome/browser/renderer_host/resource_message_filter.h"
6 6
7 #include "app/clipboard/clipboard.h" 7 #include "app/clipboard/clipboard.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #if defined(OS_POSIX) 10 #if defined(OS_POSIX)
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/printing/printer_query.h" 47 #include "chrome/browser/printing/printer_query.h"
48 #include "chrome/browser/profile.h" 48 #include "chrome/browser/profile.h"
49 #include "chrome/browser/renderer_host/audio_renderer_host.h" 49 #include "chrome/browser/renderer_host/audio_renderer_host.h"
50 #include "chrome/browser/renderer_host/browser_render_process_host.h" 50 #include "chrome/browser/renderer_host/browser_render_process_host.h"
51 #include "chrome/browser/renderer_host/database_dispatcher_host.h" 51 #include "chrome/browser/renderer_host/database_dispatcher_host.h"
52 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" 52 #include "chrome/browser/renderer_host/render_view_host_notification_task.h"
53 #include "chrome/browser/renderer_host/render_widget_helper.h" 53 #include "chrome/browser/renderer_host/render_widget_helper.h"
54 #include "chrome/browser/speech/speech_input_dispatcher_host.h" 54 #include "chrome/browser/speech/speech_input_dispatcher_host.h"
55 #include "chrome/browser/spellchecker_platform_engine.h" 55 #include "chrome/browser/spellchecker_platform_engine.h"
56 #include "chrome/browser/task_manager.h" 56 #include "chrome/browser/task_manager.h"
57 #include "chrome/browser/ui_thread_helpers.h"
57 #include "chrome/browser/worker_host/message_port_dispatcher.h" 58 #include "chrome/browser/worker_host/message_port_dispatcher.h"
58 #include "chrome/browser/worker_host/worker_service.h" 59 #include "chrome/browser/worker_host/worker_service.h"
59 #include "chrome/common/child_process_host.h" 60 #include "chrome/common/child_process_host.h"
60 #include "chrome/common/chrome_plugin_lib.h" 61 #include "chrome/common/chrome_plugin_lib.h"
61 #include "chrome/common/chrome_plugin_util.h" 62 #include "chrome/common/chrome_plugin_util.h"
62 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
63 #include "chrome/common/extensions/extension_constants.h" 64 #include "chrome/common/extensions/extension_constants.h"
64 #include "chrome/common/extensions/extension_file_util.h" 65 #include "chrome/common/extensions/extension_file_util.h"
65 #include "chrome/common/extensions/extension_message_bundle.h" 66 #include "chrome/common/extensions/extension_message_bundle.h"
66 #if defined(OS_MACOSX) 67 #if defined(OS_MACOSX)
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 int v8_memory_allocated, int v8_memory_used, base::ProcessId renderer_id) { 1030 int v8_memory_allocated, int v8_memory_used, base::ProcessId renderer_id) {
1030 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); 1031 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
1031 TaskManager::GetInstance()->model()->NotifyV8HeapStats( 1032 TaskManager::GetInstance()->model()->NotifyV8HeapStats(
1032 renderer_id, 1033 renderer_id,
1033 static_cast<size_t>(v8_memory_allocated), 1034 static_cast<size_t>(v8_memory_allocated),
1034 static_cast<size_t>(v8_memory_used)); 1035 static_cast<size_t>(v8_memory_used));
1035 } 1036 }
1036 1037
1037 void ResourceMessageFilter::OnDidZoomURL(const GURL& url, 1038 void ResourceMessageFilter::OnDidZoomURL(const GURL& url,
1038 int zoom_level) { 1039 int zoom_level) {
1039 ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, 1040 ui_thread_helpers::PostTaskWhileRunningMenu(FROM_HERE,
1040 NewRunnableMethod(this, 1041 NewRunnableMethod(this,
1041 &ResourceMessageFilter::UpdateHostZoomLevelsOnUIThread, 1042 &ResourceMessageFilter::UpdateHostZoomLevelsOnUIThread,
1042 url, zoom_level)); 1043 url, zoom_level));
1043 } 1044 }
1044 1045
1045 void ResourceMessageFilter::UpdateHostZoomLevelsOnUIThread( 1046 void ResourceMessageFilter::UpdateHostZoomLevelsOnUIThread(
1046 const GURL& url, 1047 const GURL& url,
1047 int zoom_level) { 1048 int zoom_level) {
1048 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); 1049 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
1049 host_zoom_map_->SetZoomLevel(url, zoom_level); 1050 host_zoom_map_->SetZoomLevel(url, zoom_level);
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
1676 1677
1677 ViewHostMsg_GetRawCookies::WriteReplyParams(reply_msg_, cookies); 1678 ViewHostMsg_GetRawCookies::WriteReplyParams(reply_msg_, cookies);
1678 filter_->Send(reply_msg_); 1679 filter_->Send(reply_msg_);
1679 delete this; 1680 delete this;
1680 } 1681 }
1681 } 1682 }
1682 1683
1683 void GetCookiesCompletion::set_cookie_store(CookieStore* cookie_store) { 1684 void GetCookiesCompletion::set_cookie_store(CookieStore* cookie_store) {
1684 cookie_store_ = cookie_store; 1685 cookie_store_ = cookie_store;
1685 } 1686 }
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/wrench_menu_controller.mm ('k') | chrome/browser/ui_thread_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698