| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 #include "webkit/plugins/webplugininfo.h" | 147 #include "webkit/plugins/webplugininfo.h" |
| 148 | 148 |
| 149 #if defined(ENABLE_CONFIGURATION_POLICY) | 149 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 150 #include "chrome/browser/policy/browser_policy_connector.h" | 150 #include "chrome/browser/policy/browser_policy_connector.h" |
| 151 #include "chrome/browser/policy/configuration_policy_provider.h" | 151 #include "chrome/browser/policy/configuration_policy_provider.h" |
| 152 #include "chrome/browser/policy/policy_map.h" | 152 #include "chrome/browser/policy/policy_map.h" |
| 153 #include "policy/policy_constants.h" | 153 #include "policy/policy_constants.h" |
| 154 #endif | 154 #endif |
| 155 | 155 |
| 156 #if defined(OS_CHROMEOS) | 156 #if defined(OS_CHROMEOS) |
| 157 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | 157 #include "chromeos/dbus/dbus_thread_manager.h" |
| 158 #endif | 158 #endif |
| 159 | 159 |
| 160 #if defined(OS_MACOSX) | 160 #if defined(OS_MACOSX) |
| 161 #include "base/mach_ipc_mac.h" | 161 #include "base/mach_ipc_mac.h" |
| 162 #endif | 162 #endif |
| 163 | 163 |
| 164 #if !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) | 164 #if !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) |
| 165 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" | 165 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" |
| 166 #endif // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) | 166 #endif // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) |
| 167 | 167 |
| (...skipping 6973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7141 | 7141 |
| 7142 Send(reply_message_); | 7142 Send(reply_message_); |
| 7143 redirect_query_ = 0; | 7143 redirect_query_ = 0; |
| 7144 reply_message_ = NULL; | 7144 reply_message_ = NULL; |
| 7145 } | 7145 } |
| 7146 | 7146 |
| 7147 void TestingAutomationProvider::OnRemoveProvider() { | 7147 void TestingAutomationProvider::OnRemoveProvider() { |
| 7148 if (g_browser_process) | 7148 if (g_browser_process) |
| 7149 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); | 7149 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); |
| 7150 } | 7150 } |
| OLD | NEW |