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

Side by Side Diff: chrome/browser/extensions/api/proxy/proxy_api.cc

Issue 2058233002: Rewrite simple uses of base::ListValue::Append() taking a raw pointer var. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: less comments more ownership Created 4 years, 6 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 // Implementation of the Chrome Extensions Proxy Settings API. 5 // Implementation of the Chrome Extensions Proxy Settings API.
6 6
7 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 7 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
8 8
9 #include <memory>
9 #include <utility> 10 #include <utility>
10 11
11 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
12 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
13 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "chrome/browser/extensions/api/proxy/proxy_api_constants.h" 16 #include "chrome/browser/extensions/api/proxy/proxy_api_constants.h"
16 #include "chrome/browser/extensions/api/proxy/proxy_api_helpers.h" 17 #include "chrome/browser/extensions/api/proxy/proxy_api_helpers.h"
17 #include "chrome/browser/extensions/event_router_forwarder.h" 18 #include "chrome/browser/extensions/event_router_forwarder.h"
18 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
(...skipping 14 matching lines...) Expand all
33 } 34 }
34 35
35 ProxyEventRouter::~ProxyEventRouter() { 36 ProxyEventRouter::~ProxyEventRouter() {
36 } 37 }
37 38
38 void ProxyEventRouter::OnProxyError( 39 void ProxyEventRouter::OnProxyError(
39 EventRouterForwarder* event_router, 40 EventRouterForwarder* event_router,
40 void* profile, 41 void* profile,
41 int error_code) { 42 int error_code) {
42 std::unique_ptr<base::ListValue> args(new base::ListValue()); 43 std::unique_ptr<base::ListValue> args(new base::ListValue());
43 base::DictionaryValue* dict = new base::DictionaryValue(); 44 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
44 dict->SetBoolean(keys::kProxyEventFatal, true); 45 dict->SetBoolean(keys::kProxyEventFatal, true);
45 dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code)); 46 dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code));
46 dict->SetString(keys::kProxyEventDetails, std::string()); 47 dict->SetString(keys::kProxyEventDetails, std::string());
47 args->Append(dict); 48 args->Append(std::move(dict));
48 49
49 if (profile) { 50 if (profile) {
50 event_router->DispatchEventToRenderers( 51 event_router->DispatchEventToRenderers(
51 events::PROXY_ON_PROXY_ERROR, keys::kProxyEventOnProxyError, 52 events::PROXY_ON_PROXY_ERROR, keys::kProxyEventOnProxyError,
52 std::move(args), profile, true, GURL()); 53 std::move(args), profile, true, GURL());
53 } else { 54 } else {
54 event_router->BroadcastEventToRenderers(events::PROXY_ON_PROXY_ERROR, 55 event_router->BroadcastEventToRenderers(events::PROXY_ON_PROXY_ERROR,
55 keys::kProxyEventOnProxyError, 56 keys::kProxyEventOnProxyError,
56 std::move(args), GURL()); 57 std::move(args), GURL());
57 } 58 }
58 } 59 }
59 60
60 void ProxyEventRouter::OnPACScriptError( 61 void ProxyEventRouter::OnPACScriptError(
61 EventRouterForwarder* event_router, 62 EventRouterForwarder* event_router,
62 void* profile, 63 void* profile,
63 int line_number, 64 int line_number,
64 const base::string16& error) { 65 const base::string16& error) {
65 std::unique_ptr<base::ListValue> args(new base::ListValue()); 66 std::unique_ptr<base::ListValue> args(new base::ListValue());
66 base::DictionaryValue* dict = new base::DictionaryValue(); 67 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
67 dict->SetBoolean(keys::kProxyEventFatal, false); 68 dict->SetBoolean(keys::kProxyEventFatal, false);
68 dict->SetString(keys::kProxyEventError, 69 dict->SetString(keys::kProxyEventError,
69 net::ErrorToString(net::ERR_PAC_SCRIPT_FAILED)); 70 net::ErrorToString(net::ERR_PAC_SCRIPT_FAILED));
70 std::string error_msg; 71 std::string error_msg;
71 if (line_number != -1) { 72 if (line_number != -1) {
72 base::SStringPrintf(&error_msg, 73 base::SStringPrintf(&error_msg,
73 "line: %d: %s", 74 "line: %d: %s",
74 line_number, base::UTF16ToUTF8(error).c_str()); 75 line_number, base::UTF16ToUTF8(error).c_str());
75 } else { 76 } else {
76 error_msg = base::UTF16ToUTF8(error); 77 error_msg = base::UTF16ToUTF8(error);
77 } 78 }
78 dict->SetString(keys::kProxyEventDetails, error_msg); 79 dict->SetString(keys::kProxyEventDetails, error_msg);
79 args->Append(dict); 80 args->Append(std::move(dict));
80 81
81 if (profile) { 82 if (profile) {
82 event_router->DispatchEventToRenderers( 83 event_router->DispatchEventToRenderers(
83 events::PROXY_ON_PROXY_ERROR, keys::kProxyEventOnProxyError, 84 events::PROXY_ON_PROXY_ERROR, keys::kProxyEventOnProxyError,
84 std::move(args), profile, true, GURL()); 85 std::move(args), profile, true, GURL());
85 } else { 86 } else {
86 event_router->BroadcastEventToRenderers(events::PROXY_ON_PROXY_ERROR, 87 event_router->BroadcastEventToRenderers(events::PROXY_ON_PROXY_ERROR,
87 keys::kProxyEventOnProxyError, 88 keys::kProxyEventOnProxyError,
88 std::move(args), GURL()); 89 std::move(args), GURL());
89 } 90 }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict); 185 extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict);
185 break; 186 break;
186 } 187 }
187 case ProxyPrefs::kModeCount: 188 case ProxyPrefs::kModeCount:
188 NOTREACHED(); 189 NOTREACHED();
189 } 190 }
190 return extension_pref.release(); 191 return extension_pref.release();
191 } 192 }
192 193
193 } // namespace extensions 194 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698