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

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

Issue 1638153002: Set up an stunnel endpoint for the engine. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added documentation on opening a port with Docker 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
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/browser/blimp_engine_session.h" 5 #include "blimp/engine/browser/blimp_engine_session.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "blimp/common/create_blimp_message.h" 8 #include "blimp/common/create_blimp_message.h"
9 #include "blimp/common/proto/tab_control.pb.h" 9 #include "blimp/common/proto/tab_control.pb.h"
10 #include "blimp/engine/browser/blimp_browser_context.h" 10 #include "blimp/engine/browser/blimp_browser_context.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #endif 42 #endif
43 43
44 namespace blimp { 44 namespace blimp {
45 namespace engine { 45 namespace engine {
46 namespace { 46 namespace {
47 47
48 const int kDummyTabId = 0; 48 const int kDummyTabId = 0;
49 const float kDefaultScaleFactor = 1.f; 49 const float kDefaultScaleFactor = 1.f;
50 const int kDefaultDisplayWidth = 800; 50 const int kDefaultDisplayWidth = 800;
51 const int kDefaultDisplayHeight = 600; 51 const int kDefaultDisplayHeight = 600;
52 const uint16_t kDefaultPort = 25467; 52 const uint16_t kDefaultPort = 12345;
nyquist 2016/01/27 02:02:26 Why this change? Couldn't the internal and externa
marcinjb 2016/01/27 16:38:09 I don't think we want to expose the unencrypted po
marcinjb 2016/01/28 19:29:45 Chatted offline- this is back to 25467
53 53
54 // Focus rules that support activating an child window. 54 // Focus rules that support activating an child window.
55 class FocusRulesImpl : public wm::BaseFocusRules { 55 class FocusRulesImpl : public wm::BaseFocusRules {
56 public: 56 public:
57 FocusRulesImpl() {} 57 FocusRulesImpl() {}
58 ~FocusRulesImpl() override {} 58 ~FocusRulesImpl() override {}
59 59
60 bool SupportsChildActivation(aura::Window* window) const override { 60 bool SupportsChildActivation(aura::Window* window) const override {
61 return true; 61 return true;
62 } 62 }
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 516
517 aura::Window* parent = window_tree_host_->window(); 517 aura::Window* parent = window_tree_host_->window();
518 aura::Window* content = web_contents_->GetNativeView(); 518 aura::Window* content = web_contents_->GetNativeView();
519 if (!parent->Contains(content)) 519 if (!parent->Contains(content))
520 parent->AddChild(content); 520 parent->AddChild(content);
521 content->Show(); 521 content->Show();
522 } 522 }
523 523
524 } // namespace engine 524 } // namespace engine
525 } // namespace blimp 525 } // namespace blimp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698