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

Side by Side Diff: extensions/browser/api/cast_channel/cast_channel_api.cc

Issue 576483003: Make proto enums canonical for ReadState/WriteState/ConnectState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update all path references to generated protobufs. Created 6 years, 3 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 "extensions/browser/api/cast_channel/cast_channel_api.h" 5 #include "extensions/browser/api/cast_channel/cast_channel_api.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/time/default_tick_clock.h" 13 #include "base/time/default_tick_clock.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "extensions/browser/api/cast_channel/cast_socket.h" 16 #include "extensions/browser/api/cast_channel/cast_socket.h"
17 #include "extensions/browser/api/cast_channel/logger.h" 17 #include "extensions/browser/api/cast_channel/logger.h"
18 #include "extensions/browser/api/cast_channel/logging.pb.h"
19 #include "extensions/browser/event_router.h" 18 #include "extensions/browser/event_router.h"
19 #include "extensions/common/api/cast_channel/logging.pb.h"
20 #include "net/base/ip_endpoint.h" 20 #include "net/base/ip_endpoint.h"
21 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
22 #include "net/base/net_util.h" 22 #include "net/base/net_util.h"
23 #include "url/gurl.h" 23 #include "url/gurl.h"
24 24
25 // Default timeout interval for connection setup. 25 // Default timeout interval for connection setup.
26 // Used if not otherwise specified at ConnectInfo::timeout. 26 // Used if not otherwise specified at ConnectInfo::timeout.
27 const int kDefaultConnectTimeoutMillis = 5000; // 5 seconds. 27 const int kDefaultConnectTimeoutMillis = 5000; // 5 seconds.
28 28
29 namespace extensions { 29 namespace extensions {
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 } else { 502 } else {
503 SetError("Unable to get logs."); 503 SetError("Unable to get logs.");
504 } 504 }
505 505
506 api_->GetLogger()->Reset(); 506 api_->GetLogger()->Reset();
507 507
508 AsyncWorkCompleted(); 508 AsyncWorkCompleted();
509 } 509 }
510 510
511 } // namespace extensions 511 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/cast_channel/cast_channel.proto ('k') | extensions/browser/api/cast_channel/cast_framer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698