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

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

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/testing_automation_provider.h" 5 #include "chrome/browser/automation/testing_automation_provider.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2600 matching lines...) Expand 10 before | Expand all | Expand 10 after
2611 properties->SetString("ChromeVersion", chrome::kChromeVersion); 2611 properties->SetString("ChromeVersion", chrome::kChromeVersion);
2612 properties->SetString("BrowserProcessExecutableName", 2612 properties->SetString("BrowserProcessExecutableName",
2613 chrome::kBrowserProcessExecutableName); 2613 chrome::kBrowserProcessExecutableName);
2614 properties->SetString("HelperProcessExecutableName", 2614 properties->SetString("HelperProcessExecutableName",
2615 chrome::kHelperProcessExecutableName); 2615 chrome::kHelperProcessExecutableName);
2616 properties->SetString("BrowserProcessExecutablePath", 2616 properties->SetString("BrowserProcessExecutablePath",
2617 chrome::kBrowserProcessExecutablePath); 2617 chrome::kBrowserProcessExecutablePath);
2618 properties->SetString("HelperProcessExecutablePath", 2618 properties->SetString("HelperProcessExecutablePath",
2619 chrome::kHelperProcessExecutablePath); 2619 chrome::kHelperProcessExecutablePath);
2620 properties->SetString("command_line_string", 2620 properties->SetString("command_line_string",
2621 CommandLine::ForCurrentProcess()->command_line_string()); 2621 CommandLine::ForCurrentProcess()->GetCommandLineString());
2622 FilePath dumps_path; 2622 FilePath dumps_path;
2623 PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path); 2623 PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
2624 properties->SetString("DIR_CRASH_DUMPS", dumps_path.value()); 2624 properties->SetString("DIR_CRASH_DUMPS", dumps_path.value());
2625 2625
2626 std::string branding; 2626 std::string branding;
2627 #if defined(GOOGLE_CHROME_BUILD) 2627 #if defined(GOOGLE_CHROME_BUILD)
2628 branding = "Google Chrome"; 2628 branding = "Google Chrome";
2629 #elif defined(CHROMIUM_BUILD) 2629 #elif defined(CHROMIUM_BUILD)
2630 branding = "Chromium"; 2630 branding = "Chromium";
2631 #else 2631 #else
(...skipping 3419 matching lines...) Expand 10 before | Expand all | Expand 10 after
6051 IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl); 6051 IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
6052 6052
6053 Send(reply_message_); 6053 Send(reply_message_);
6054 redirect_query_ = 0; 6054 redirect_query_ = 0;
6055 reply_message_ = NULL; 6055 reply_message_ = NULL;
6056 } 6056 }
6057 6057
6058 void TestingAutomationProvider::OnRemoveProvider() { 6058 void TestingAutomationProvider::OnRemoveProvider() {
6059 AutomationProviderList::GetInstance()->RemoveProvider(this); 6059 AutomationProviderList::GetInstance()->RemoveProvider(this);
6060 } 6060 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698