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

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
« no previous file with comments | « chrome/browser/about_flags_unittest.cc ('k') | chrome/browser/browser_about_handler.cc » ('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) 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 2601 matching lines...) Expand 10 before | Expand all | Expand 10 after
2612 properties->SetString("ChromeVersion", chrome::kChromeVersion); 2612 properties->SetString("ChromeVersion", chrome::kChromeVersion);
2613 properties->SetString("BrowserProcessExecutableName", 2613 properties->SetString("BrowserProcessExecutableName",
2614 chrome::kBrowserProcessExecutableName); 2614 chrome::kBrowserProcessExecutableName);
2615 properties->SetString("HelperProcessExecutableName", 2615 properties->SetString("HelperProcessExecutableName",
2616 chrome::kHelperProcessExecutableName); 2616 chrome::kHelperProcessExecutableName);
2617 properties->SetString("BrowserProcessExecutablePath", 2617 properties->SetString("BrowserProcessExecutablePath",
2618 chrome::kBrowserProcessExecutablePath); 2618 chrome::kBrowserProcessExecutablePath);
2619 properties->SetString("HelperProcessExecutablePath", 2619 properties->SetString("HelperProcessExecutablePath",
2620 chrome::kHelperProcessExecutablePath); 2620 chrome::kHelperProcessExecutablePath);
2621 properties->SetString("command_line_string", 2621 properties->SetString("command_line_string",
2622 CommandLine::ForCurrentProcess()->command_line_string()); 2622 CommandLine::ForCurrentProcess()->GetCommandLineString());
2623 FilePath dumps_path; 2623 FilePath dumps_path;
2624 PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path); 2624 PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
2625 properties->SetString("DIR_CRASH_DUMPS", dumps_path.value()); 2625 properties->SetString("DIR_CRASH_DUMPS", dumps_path.value());
2626 2626
2627 std::string branding; 2627 std::string branding;
2628 #if defined(GOOGLE_CHROME_BUILD) 2628 #if defined(GOOGLE_CHROME_BUILD)
2629 branding = "Google Chrome"; 2629 branding = "Google Chrome";
2630 #elif defined(CHROMIUM_BUILD) 2630 #elif defined(CHROMIUM_BUILD)
2631 branding = "Chromium"; 2631 branding = "Chromium";
2632 #else 2632 #else
(...skipping 3419 matching lines...) Expand 10 before | Expand all | Expand 10 after
6052 IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl); 6052 IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
6053 6053
6054 Send(reply_message_); 6054 Send(reply_message_);
6055 redirect_query_ = 0; 6055 redirect_query_ = 0;
6056 reply_message_ = NULL; 6056 reply_message_ = NULL;
6057 } 6057 }
6058 6058
6059 void TestingAutomationProvider::OnRemoveProvider() { 6059 void TestingAutomationProvider::OnRemoveProvider() {
6060 AutomationProviderList::GetInstance()->RemoveProvider(this); 6060 AutomationProviderList::GetInstance()->RemoveProvider(this);
6061 } 6061 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags_unittest.cc ('k') | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698