summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 05:01:07 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 05:01:07 +0000
commit792556cf01f0d049e207b98dac8e1d5970f562af (patch)
treeb11aa1bdb36d90d12f1fa901d9a93a2916f858b9
parent73d3a86c4ece60c7e703217f20bd1ea50f50356c (diff)
downloadchromium_src-792556cf01f0d049e207b98dac8e1d5970f562af.zip
chromium_src-792556cf01f0d049e207b98dac8e1d5970f562af.tar.gz
chromium_src-792556cf01f0d049e207b98dac8e1d5970f562af.tar.bz2
Move RLZ extension api implementation to rlz directory.
We're moving all the extension api implementations out of browser/extensions into the directory with the code they are automating. BUG=101244 Review URL: http://codereview.chromium.org/8374025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107064 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_function_dispatcher.cc2
-rw-r--r--chrome/browser/rlz/rlz_extension_api.cc (renamed from chrome/browser/extensions/extension_rlz_module.cc)2
-rw-r--r--chrome/browser/rlz/rlz_extension_api.h (renamed from chrome/browser/extensions/extension_rlz_module.h)8
-rw-r--r--chrome/browser/rlz/rlz_extension_apitest.cc (renamed from chrome/browser/extensions/extension_rlz_apitest.cc)4
-rw-r--r--chrome/chrome_browser.gypi4
-rw-r--r--chrome/chrome_tests.gypi4
6 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 4dae311..8144a7e 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -37,7 +37,6 @@
#include "chrome/browser/extensions/extension_preference_api.h"
#include "chrome/browser/extensions/extension_processes_api.h"
#include "chrome/browser/extensions/extension_proxy_api.h"
-#include "chrome/browser/extensions/extension_rlz_module.h"
#include "chrome/browser/extensions/extension_save_page_api.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_settings_api.h"
@@ -58,6 +57,7 @@
#include "chrome/browser/history/history_extension_api.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/chrome_render_message_filter.h"
+#include "chrome/browser/rlz/rlz_extension_api.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/extensions/extension_messages.h"
diff --git a/chrome/browser/extensions/extension_rlz_module.cc b/chrome/browser/rlz/rlz_extension_api.cc
index c789a86..02a4a18 100644
--- a/chrome/browser/extensions/extension_rlz_module.cc
+++ b/chrome/browser/rlz/rlz_extension_api.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_rlz_module.h"
+#include "chrome/browser/rlz/rlz_extension_api.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/extensions/extension_rlz_module.h b/chrome/browser/rlz/rlz_extension_api.h
index 83cb662..45c892e 100644
--- a/chrome/browser/extensions/extension_rlz_module.h
+++ b/chrome/browser/rlz/rlz_extension_api.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_RLZ_MODULE_H__
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_RLZ_MODULE_H__
+#ifndef CHROME_BROWSER_RLZ_RLZ_EXTENSION_API_H_
+#define CHROME_BROWSER_RLZ_RLZ_EXTENSION_API_H_
#pragma once
#include "build/build_config.h"
@@ -36,4 +36,4 @@ class RlzClearProductStateFunction : public SyncExtensionFunction {
#endif // defined(OS_WIN)
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_RLZ_MODULE_H__
+#endif // CHROME_BROWSER_RLZ_RLZ_EXTENSION_API_H_
diff --git a/chrome/browser/extensions/extension_rlz_apitest.cc b/chrome/browser/rlz/rlz_extension_apitest.cc
index f7f264d..454efa1 100644
--- a/chrome/browser/extensions/extension_rlz_apitest.cc
+++ b/chrome/browser/rlz/rlz_extension_apitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,7 +8,7 @@
#include "chrome/browser/extensions/extension_function.h"
#include "chrome/browser/extensions/extension_function_dispatcher.h"
#include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_rlz_module.h"
+#include "chrome/browser/rlz/rlz_extension_api.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
#include "rlz/win/lib/rlz_lib.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9bec609..6c62cca 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1107,8 +1107,6 @@
'browser/extensions/extension_proxy_api_constants.h',
'browser/extensions/extension_proxy_api_helpers.cc',
'browser/extensions/extension_proxy_api_helpers.h',
- 'browser/extensions/extension_rlz_module.cc',
- 'browser/extensions/extension_rlz_module.h',
'browser/extensions/extension_save_page_api.cc',
'browser/extensions/extension_save_page_api.h',
'browser/extensions/extension_setting_changes.cc',
@@ -1988,6 +1986,8 @@
'browser/resources_util.h',
'browser/rlz/rlz.cc',
'browser/rlz/rlz.h',
+ 'browser/rlz/rlz_extension_api.cc',
+ 'browser/rlz/rlz_extension_api.h',
'browser/safe_browsing/bloom_filter.cc',
'browser/safe_browsing/bloom_filter.h',
'browser/safe_browsing/browser_feature_extractor.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3c403b9..8dd8a51 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2415,7 +2415,6 @@
'browser/extensions/extension_processes_apitest.cc',
'browser/extensions/extension_proxy_apitest.cc',
'browser/extensions/extension_resource_request_policy_apitest.cc',
- 'browser/extensions/extension_rlz_apitest.cc',
'browser/extensions/extension_save_page_apitest.cc',
'browser/extensions/extension_settings_apitest.cc',
'browser/extensions/extension_sidebar_apitest.cc',
@@ -2468,6 +2467,7 @@
'browser/prerender/prerender_browsertest.cc',
'browser/printing/print_dialog_cloud_uitest.cc',
'browser/printing/print_preview_tab_controller_browsertest.cc',
+ 'browser/rlz/rlz_extension_apitest.cc',
'browser/renderer_host/render_process_host_chrome_browsertest.cc',
'browser/renderer_host/web_cache_manager_browsertest.cc',
'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
@@ -2715,7 +2715,7 @@
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_version.rc.version',
- 'browser/extensions/extension_rlz_apitest.cc',
+ 'browser/rlz/rlz_extension_apitest.cc',
# http://crbug.com/15101 These tests fail on Linux and Mac.
'browser/renderer_host/web_cache_manager_browsertest.cc',
'../content/browser/child_process_security_policy_browsertest.cc',