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

Side by Side Diff: blimp/engine/session/blimp_engine_session.cc

Issue 1718333002: Migrate blimp/* to net::IPAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments eroman Created 4 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
« no previous file with comments | « no previous file | blimp/net/tcp_transport_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "blimp/engine/session/blimp_engine_session.h" 5 #include "blimp/engine/session/blimp_engine_session.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "blimp/common/create_blimp_message.h" 10 #include "blimp/common/create_blimp_message.h"
(...skipping 13 matching lines...) Expand all
24 #include "blimp/net/engine_connection_manager.h" 24 #include "blimp/net/engine_connection_manager.h"
25 #include "blimp/net/null_blimp_message_processor.h" 25 #include "blimp/net/null_blimp_message_processor.h"
26 #include "blimp/net/tcp_engine_transport.h" 26 #include "blimp/net/tcp_engine_transport.h"
27 #include "content/public/browser/browser_context.h" 27 #include "content/public/browser/browser_context.h"
28 #include "content/public/browser/browser_thread.h" 28 #include "content/public/browser/browser_thread.h"
29 #include "content/public/browser/navigation_controller.h" 29 #include "content/public/browser/navigation_controller.h"
30 #include "content/public/browser/navigation_entry.h" 30 #include "content/public/browser/navigation_entry.h"
31 #include "content/public/browser/render_view_host.h" 31 #include "content/public/browser/render_view_host.h"
32 #include "content/public/browser/render_widget_host.h" 32 #include "content/public/browser/render_widget_host.h"
33 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
34 #include "net/base/ip_address.h"
34 #include "net/base/net_errors.h" 35 #include "net/base/net_errors.h"
35 #include "ui/aura/client/default_capture_client.h" 36 #include "ui/aura/client/default_capture_client.h"
36 #include "ui/aura/env.h" 37 #include "ui/aura/env.h"
37 #include "ui/aura/window.h" 38 #include "ui/aura/window.h"
38 #include "ui/aura/window_tree_host.h" 39 #include "ui/aura/window_tree_host.h"
39 #include "ui/gfx/geometry/size.h" 40 #include "ui/gfx/geometry/size.h"
40 #include "ui/wm/core/base_focus_rules.h" 41 #include "ui/wm/core/base_focus_rules.h"
41 #include "ui/wm/core/default_activation_client.h" 42 #include "ui/wm/core/default_activation_client.h"
42 #include "ui/wm/core/focus_controller.h" 43 #include "ui/wm/core/focus_controller.h"
43 44
(...skipping 15 matching lines...) Expand all
59 ~FocusRulesImpl() override {} 60 ~FocusRulesImpl() override {}
60 61
61 bool SupportsChildActivation(aura::Window* window) const override { 62 bool SupportsChildActivation(aura::Window* window) const override {
62 return true; 63 return true;
63 } 64 }
64 65
65 private: 66 private:
66 DISALLOW_COPY_AND_ASSIGN(FocusRulesImpl); 67 DISALLOW_COPY_AND_ASSIGN(FocusRulesImpl);
67 }; 68 };
68 69
69 net::IPAddressNumber GetIPv4AnyAddress() { 70 net::IPAddress GetIPv4AnyAddress() {
70 net::IPAddressNumber output; 71 return net::IPAddress(0, 0, 0, 0);
71 output.push_back(0);
72 output.push_back(0);
73 output.push_back(0);
74 output.push_back(0);
75 return output;
76 } 72 }
77 73
78 } // namespace 74 } // namespace
79 75
80 // EngineNetworkComponents is created by the BlimpEngineSession on the UI 76 // EngineNetworkComponents is created by the BlimpEngineSession on the UI
81 // thread, and then used and destroyed on the IO thread. 77 // thread, and then used and destroyed on the IO thread.
82 class EngineNetworkComponents { 78 class EngineNetworkComponents {
83 public: 79 public:
84 explicit EngineNetworkComponents(net::NetLog* net_log); 80 explicit EngineNetworkComponents(net::NetLog* net_log);
85 ~EngineNetworkComponents(); 81 ~EngineNetworkComponents();
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 508
513 aura::Window* parent = window_tree_host_->window(); 509 aura::Window* parent = window_tree_host_->window();
514 aura::Window* content = web_contents_->GetNativeView(); 510 aura::Window* content = web_contents_->GetNativeView();
515 if (!parent->Contains(content)) 511 if (!parent->Contains(content))
516 parent->AddChild(content); 512 parent->AddChild(content);
517 content->Show(); 513 content->Show();
518 } 514 }
519 515
520 } // namespace engine 516 } // namespace engine
521 } // namespace blimp 517 } // namespace blimp
OLDNEW
« no previous file with comments | « no previous file | blimp/net/tcp_transport_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698