OLD | NEW |
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/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 2823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2834 chrome::kHelperProcessExecutableName); | 2834 chrome::kHelperProcessExecutableName); |
2835 properties->SetString("BrowserProcessExecutablePath", | 2835 properties->SetString("BrowserProcessExecutablePath", |
2836 chrome::kBrowserProcessExecutablePath); | 2836 chrome::kBrowserProcessExecutablePath); |
2837 properties->SetString("HelperProcessExecutablePath", | 2837 properties->SetString("HelperProcessExecutablePath", |
2838 chrome::kHelperProcessExecutablePath); | 2838 chrome::kHelperProcessExecutablePath); |
2839 properties->SetString("command_line_string", | 2839 properties->SetString("command_line_string", |
2840 CommandLine::ForCurrentProcess()->GetCommandLineString()); | 2840 CommandLine::ForCurrentProcess()->GetCommandLineString()); |
2841 FilePath dumps_path; | 2841 FilePath dumps_path; |
2842 PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path); | 2842 PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path); |
2843 properties->SetString("DIR_CRASH_DUMPS", dumps_path.value()); | 2843 properties->SetString("DIR_CRASH_DUMPS", dumps_path.value()); |
| 2844 #if defined(USE_AURA) |
| 2845 properties->SetBoolean("aura", true); |
| 2846 #else |
| 2847 properties->SetBoolean("aura", false); |
| 2848 #endif |
2844 | 2849 |
2845 std::string branding; | 2850 std::string branding; |
2846 #if defined(GOOGLE_CHROME_BUILD) | 2851 #if defined(GOOGLE_CHROME_BUILD) |
2847 branding = "Google Chrome"; | 2852 branding = "Google Chrome"; |
2848 #elif defined(CHROMIUM_BUILD) | 2853 #elif defined(CHROMIUM_BUILD) |
2849 branding = "Chromium"; | 2854 branding = "Chromium"; |
2850 #else | 2855 #else |
2851 branding = "Unknown Branding"; | 2856 branding = "Unknown Branding"; |
2852 #endif | 2857 #endif |
2853 properties->SetString("branding", branding); | 2858 properties->SetString("branding", branding); |
(...skipping 4047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6901 | 6906 |
6902 Send(reply_message_); | 6907 Send(reply_message_); |
6903 redirect_query_ = 0; | 6908 redirect_query_ = 0; |
6904 reply_message_ = NULL; | 6909 reply_message_ = NULL; |
6905 } | 6910 } |
6906 | 6911 |
6907 void TestingAutomationProvider::OnRemoveProvider() { | 6912 void TestingAutomationProvider::OnRemoveProvider() { |
6908 if (g_browser_process) | 6913 if (g_browser_process) |
6909 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); | 6914 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); |
6910 } | 6915 } |
OLD | NEW |