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

Side by Side Diff: mojo/services/network/net_adapters.cc

Issue 933973002: Return errors from the Mojo network service using an enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Generate the static_asserts using a macro. Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "mojo/services/network/net_adapters.h" 5 #include "mojo/services/network/net_adapters.h"
6 6
7 #include "net/base/net_errors.h" 7 #include "net/base/net_errors.h"
8 8
9 namespace mojo { 9 namespace mojo {
10 10
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 : net::WrappedIOBuffer(pending_buffer->buffer()), 101 : net::WrappedIOBuffer(pending_buffer->buffer()),
102 pending_buffer_(pending_buffer) { 102 pending_buffer_(pending_buffer) {
103 } 103 }
104 104
105 MojoToNetIOBuffer::~MojoToNetIOBuffer() { 105 MojoToNetIOBuffer::~MojoToNetIOBuffer() {
106 } 106 }
107 107
108 // ----------------------------------------------------------------------------- 108 // -----------------------------------------------------------------------------
109 109
110 NetworkErrorPtr MakeNetworkError(int error_code) { 110 NetworkErrorPtr MakeNetworkError(int error_code) {
111 // The NetworkCode enum values defined in network_error.mojom should match net
112 // error codes from net/net_errors.h.
113 static_assert(NETWORK_CODE_OK == static_cast<NetworkCode>(net::OK),
114 "Network code enum mismatch.");
115 static_assert(
116 NETWORK_CODE_IO_PENDING == static_cast<NetworkCode>(net::ERR_IO_PENDING),
117 "Network code enum mismatch.");
118 #define NET_ERROR(label, value) \
119 static_assert( \
120 NETWORK_CODE_ ## label == \
121 static_cast<NetworkCode>(net::ERR_ ## label), \
122 "Network code enum mismatch.");
123 #include "net/base/net_error_list.h"
124 #undef NET_ERROR
125
111 NetworkErrorPtr error = NetworkError::New(); 126 NetworkErrorPtr error = NetworkError::New();
112 error->code = error_code; 127 error->code = static_cast<NetworkCode>(error_code);
113 if (error_code <= 0) 128 if (error_code <= 0)
114 error->description = net::ErrorToString(error_code); 129 error->description = net::ErrorToString(error_code);
115 return error.Pass(); 130 return error.Pass();
116 } 131 }
117 132
118 } // namespace mojo 133 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/html_viewer/weburlloader_impl.cc ('k') | mojo/services/network/public/interfaces/network_error.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698