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

Side by Side Diff: chrome/common/custom_handlers/protocol_handler.cc

Issue 12207167: Cleanup: Remove deprecated base::Value methods from chrome/common. Use base::Value too. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/common/extensions/api/extension_api_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/custom_handlers/protocol_handler.h" 5 #include "chrome/common/custom_handlers/protocol_handler.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "net/base/escape.h" 9 #include "net/base/escape.h"
10 10
(...skipping 10 matching lines...) Expand all
21 const std::string& protocol, 21 const std::string& protocol,
22 const GURL& url, 22 const GURL& url,
23 const string16& title) { 23 const string16& title) {
24 std::string lower_protocol = StringToLowerASCII(protocol); 24 std::string lower_protocol = StringToLowerASCII(protocol);
25 return ProtocolHandler(lower_protocol, url, title); 25 return ProtocolHandler(lower_protocol, url, title);
26 } 26 }
27 27
28 ProtocolHandler::ProtocolHandler() { 28 ProtocolHandler::ProtocolHandler() {
29 } 29 }
30 30
31 bool ProtocolHandler::IsValidDict(const DictionaryValue* value) { 31 bool ProtocolHandler::IsValidDict(const base::DictionaryValue* value) {
32 return value->HasKey("protocol") && value->HasKey("url") && 32 return value->HasKey("protocol") && value->HasKey("url") &&
33 value->HasKey("title"); 33 value->HasKey("title");
34 } 34 }
35 35
36 bool ProtocolHandler::IsSameOrigin( 36 bool ProtocolHandler::IsSameOrigin(
37 const ProtocolHandler& handler) const { 37 const ProtocolHandler& handler) const {
38 return handler.url().GetOrigin() == url_.GetOrigin(); 38 return handler.url().GetOrigin() == url_.GetOrigin();
39 } 39 }
40 40
41 const ProtocolHandler& ProtocolHandler::EmptyProtocolHandler() { 41 const ProtocolHandler& ProtocolHandler::EmptyProtocolHandler() {
42 static const ProtocolHandler* const kEmpty = new ProtocolHandler(); 42 static const ProtocolHandler* const kEmpty = new ProtocolHandler();
43 return *kEmpty; 43 return *kEmpty;
44 } 44 }
45 45
46 ProtocolHandler ProtocolHandler::CreateProtocolHandler( 46 ProtocolHandler ProtocolHandler::CreateProtocolHandler(
47 const DictionaryValue* value) { 47 const base::DictionaryValue* value) {
48 if (!IsValidDict(value)) { 48 if (!IsValidDict(value)) {
49 return EmptyProtocolHandler(); 49 return EmptyProtocolHandler();
50 } 50 }
51 std::string protocol, url; 51 std::string protocol, url;
52 string16 title; 52 string16 title;
53 value->GetString("protocol", &protocol); 53 value->GetString("protocol", &protocol);
54 value->GetString("url", &url); 54 value->GetString("url", &url);
55 value->GetString("title", &title); 55 value->GetString("title", &title);
56 return ProtocolHandler::CreateProtocolHandler(protocol, GURL(url), title); 56 return ProtocolHandler::CreateProtocolHandler(protocol, GURL(url), title);
57 } 57 }
58 58
59 GURL ProtocolHandler::TranslateUrl(const GURL& url) const { 59 GURL ProtocolHandler::TranslateUrl(const GURL& url) const {
60 std::string translatedUrlSpec(url_.spec()); 60 std::string translatedUrlSpec(url_.spec());
61 ReplaceSubstringsAfterOffset(&translatedUrlSpec, 0, "%s", 61 ReplaceSubstringsAfterOffset(&translatedUrlSpec, 0, "%s",
62 net::EscapeQueryParamValue(url.spec(), true)); 62 net::EscapeQueryParamValue(url.spec(), true));
63 return GURL(translatedUrlSpec); 63 return GURL(translatedUrlSpec);
64 } 64 }
65 65
66 DictionaryValue* ProtocolHandler::Encode() const { 66 base::DictionaryValue* ProtocolHandler::Encode() const {
67 DictionaryValue* d = new DictionaryValue(); 67 base::DictionaryValue* d = new base::DictionaryValue();
68 d->Set("protocol", Value::CreateStringValue(protocol_)); 68 d->Set("protocol", new base::StringValue(protocol_));
69 d->Set("url", Value::CreateStringValue(url_.spec())); 69 d->Set("url", new base::StringValue(url_.spec()));
70 d->Set("title", Value::CreateStringValue(title_)); 70 d->Set("title", new base::StringValue(title_));
71 return d; 71 return d;
72 } 72 }
73 73
74 #if !defined(NDEBUG) 74 #if !defined(NDEBUG)
75 std::string ProtocolHandler::ToString() const { 75 std::string ProtocolHandler::ToString() const {
76 return "{ protocol=" + protocol_ + 76 return "{ protocol=" + protocol_ +
77 ", url=" + url_.spec() + 77 ", url=" + url_.spec() +
78 ", title=" + UTF16ToASCII(title_) + 78 ", title=" + UTF16ToASCII(title_) +
79 " }"; 79 " }";
80 } 80 }
81 #endif 81 #endif
82 82
83 bool ProtocolHandler::operator==(const ProtocolHandler& other) const { 83 bool ProtocolHandler::operator==(const ProtocolHandler& other) const {
84 return protocol_ == other.protocol_ && 84 return protocol_ == other.protocol_ &&
85 url_ == other.url_ && 85 url_ == other.url_ &&
86 title_ == other.title_; 86 title_ == other.title_;
87 } 87 }
88 88
89 bool ProtocolHandler::IsEquivalent(const ProtocolHandler& other) const { 89 bool ProtocolHandler::IsEquivalent(const ProtocolHandler& other) const {
90 return protocol_ == other.protocol_ && url_ == other.url_; 90 return protocol_ == other.protocol_ && url_ == other.url_;
91 } 91 }
92 92
93 bool ProtocolHandler::operator<(const ProtocolHandler& other) const { 93 bool ProtocolHandler::operator<(const ProtocolHandler& other) const {
94 return title_ < other.title_; 94 return title_ < other.title_;
95 } 95 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/extensions/api/extension_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698