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

Side by Side Diff: chrome/browser/automation/automation_provider.cc

Issue 12150004: Category group support/Renamings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: More renamings and category filter cleanups. Created 7 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/automation/automation_provider.h" 5 #include "chrome/browser/automation/automation_provider.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 RenderViewHost* view = GetViewForTab(tab_handle); 760 RenderViewHost* view = GetViewForTab(tab_handle);
761 if (!view) { 761 if (!view) {
762 NOTREACHED(); 762 NOTREACHED();
763 return; 763 return;
764 } 764 }
765 765
766 view->Send(new ChromeViewMsg_JavaScriptStressTestControl( 766 view->Send(new ChromeViewMsg_JavaScriptStressTestControl(
767 view->GetRoutingID(), cmd, param)); 767 view->GetRoutingID(), cmd, param));
768 } 768 }
769 769
770 void AutomationProvider::BeginTracing(const std::string& categories, 770 void AutomationProvider::BeginTracing(const std::string& category_patterns,
771 bool* success) { 771 bool* success) {
772 tracing_data_.trace_output.clear(); 772 tracing_data_.trace_output.clear();
773 *success = TraceController::GetInstance()->BeginTracing(this, categories); 773 *success = TraceController::GetInstance()->BeginTracing(this,
774 category_patterns);
774 } 775 }
775 776
776 void AutomationProvider::EndTracing(IPC::Message* reply_message) { 777 void AutomationProvider::EndTracing(IPC::Message* reply_message) {
777 bool success = false; 778 bool success = false;
778 if (!tracing_data_.reply_message.get()) 779 if (!tracing_data_.reply_message.get())
779 success = TraceController::GetInstance()->EndTracingAsync(this); 780 success = TraceController::GetInstance()->EndTracingAsync(this);
780 if (success) { 781 if (success) {
781 // Defer EndTracing reply until TraceController calls us back with all the 782 // Defer EndTracing reply until TraceController calls us back with all the
782 // events. 783 // events.
783 tracing_data_.reply_message.reset(reply_message); 784 tracing_data_.reply_message.reset(reply_message);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 823
823 return NULL; 824 return NULL;
824 } 825 }
825 826
826 void AutomationProvider::SaveAsAsync(int tab_handle) { 827 void AutomationProvider::SaveAsAsync(int tab_handle) {
827 NavigationController* tab = NULL; 828 NavigationController* tab = NULL;
828 WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab); 829 WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab);
829 if (web_contents) 830 if (web_contents)
830 web_contents->OnSavePage(); 831 web_contents->OnSavePage();
831 } 832 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698