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

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

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: _ Created 8 years, 9 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/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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 #include "webkit/plugins/webplugininfo.h" 146 #include "webkit/plugins/webplugininfo.h"
147 147
148 #if defined(ENABLE_CONFIGURATION_POLICY) 148 #if defined(ENABLE_CONFIGURATION_POLICY)
149 #include "chrome/browser/policy/browser_policy_connector.h" 149 #include "chrome/browser/policy/browser_policy_connector.h"
150 #include "chrome/browser/policy/configuration_policy_provider.h" 150 #include "chrome/browser/policy/configuration_policy_provider.h"
151 #include "chrome/browser/policy/policy_map.h" 151 #include "chrome/browser/policy/policy_map.h"
152 #include "policy/policy_constants.h" 152 #include "policy/policy_constants.h"
153 #endif 153 #endif
154 154
155 #if defined(OS_CHROMEOS) 155 #if defined(OS_CHROMEOS)
156 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 156 #include "chromeos/dbus/dbus_thread_manager.h"
157 #endif 157 #endif
158 158
159 #if defined(OS_MACOSX) 159 #if defined(OS_MACOSX)
160 #include "base/mach_ipc_mac.h" 160 #include "base/mach_ipc_mac.h"
161 #endif 161 #endif
162 162
163 #if !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) 163 #if !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
164 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" 164 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
165 #endif // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) 165 #endif // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
166 166
(...skipping 6899 matching lines...) Expand 10 before | Expand all | Expand 10 after
7066 7066
7067 Send(reply_message_); 7067 Send(reply_message_);
7068 redirect_query_ = 0; 7068 redirect_query_ = 0;
7069 reply_message_ = NULL; 7069 reply_message_ = NULL;
7070 } 7070 }
7071 7071
7072 void TestingAutomationProvider::OnRemoveProvider() { 7072 void TestingAutomationProvider::OnRemoveProvider() {
7073 if (g_browser_process) 7073 if (g_browser_process)
7074 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); 7074 g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
7075 } 7075 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698