| Index: chrome/browser/extensions/api/proxy/proxy_api.cc
|
| diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc
|
| similarity index 89%
|
| rename from chrome/browser/extensions/extension_proxy_api.cc
|
| rename to chrome/browser/extensions/api/proxy/proxy_api.cc
|
| index 2dedbd8ef747bc70634b2a7e6c3a2dc51722c800..79bbc2e34e7c73bb88d44fce260b05372c50f0f2 100644
|
| --- a/chrome/browser/extensions/extension_proxy_api.cc
|
| +++ b/chrome/browser/extensions/api/proxy/proxy_api.cc
|
| @@ -1,37 +1,39 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 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.
|
|
|
| // Implementation of the Chrome Extensions Proxy Settings API.
|
|
|
| -#include "chrome/browser/extensions/extension_proxy_api.h"
|
| +#include "chrome/browser/extensions/api/proxy/proxy_api.h"
|
|
|
| #include "base/json/json_writer.h"
|
| #include "base/stringprintf.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "base/values.h"
|
| +#include "chrome/browser/extensions/api/proxy/proxy_api_constants.h"
|
| +#include "chrome/browser/extensions/api/proxy/proxy_api_helpers.h"
|
| #include "chrome/browser/extensions/extension_event_router_forwarder.h"
|
| -#include "chrome/browser/extensions/extension_proxy_api_constants.h"
|
| -#include "chrome/browser/extensions/extension_proxy_api_helpers.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/prefs/proxy_config_dictionary.h"
|
| #include "net/base/net_errors.h"
|
|
|
| -namespace helpers = extension_proxy_api_helpers;
|
| -namespace keys = extension_proxy_api_constants;
|
| +namespace extensions {
|
| +
|
| +namespace helpers = proxy_api_helpers;
|
| +namespace keys = proxy_api_constants;
|
|
|
| // static
|
| -ExtensionProxyEventRouter* ExtensionProxyEventRouter::GetInstance() {
|
| - return Singleton<ExtensionProxyEventRouter>::get();
|
| +ProxyEventRouter* ProxyEventRouter::GetInstance() {
|
| + return Singleton<ProxyEventRouter>::get();
|
| }
|
|
|
| -ExtensionProxyEventRouter::ExtensionProxyEventRouter() {
|
| +ProxyEventRouter::ProxyEventRouter() {
|
| }
|
|
|
| -ExtensionProxyEventRouter::~ExtensionProxyEventRouter() {
|
| +ProxyEventRouter::~ProxyEventRouter() {
|
| }
|
|
|
| -void ExtensionProxyEventRouter::OnProxyError(
|
| +void ProxyEventRouter::OnProxyError(
|
| ExtensionEventRouterForwarder* event_router,
|
| void* profile,
|
| int error_code) {
|
| @@ -54,7 +56,7 @@ void ExtensionProxyEventRouter::OnProxyError(
|
| }
|
| }
|
|
|
| -void ExtensionProxyEventRouter::OnPACScriptError(
|
| +void ProxyEventRouter::OnPACScriptError(
|
| ExtensionEventRouterForwarder* event_router,
|
| void* profile,
|
| int line_number,
|
| @@ -182,3 +184,5 @@ Value* ProxyPrefTransformer::BrowserToExtensionPref(const Value* browser_pref) {
|
| }
|
| return extension_pref.release();
|
| }
|
| +
|
| +} // namespace extensions
|
|
|