| OLD | NEW |
| 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/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "blimp/common/create_blimp_message.h" | 9 #include "blimp/common/create_blimp_message.h" |
| 10 #include "blimp/common/proto/blimp_message.pb.h" | 10 #include "blimp/common/proto/blimp_message.pb.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 kDefaultPortNumber = 25467; | 52 const uint16_t kDefaultPortNumber = 25467; |
| 53 | 53 |
| 54 base::LazyInstance<blimp::NullBlimpMessageProcessor> g_blimp_message_processor = | 54 base::LazyInstance<blimp::NullBlimpMessageProcessor> g_blimp_message_processor = |
| 55 LAZY_INSTANCE_INITIALIZER; | 55 LAZY_INSTANCE_INITIALIZER; |
| 56 | 56 |
| 57 // Focus rules that support activating an child window. | 57 // Focus rules that support activating an child window. |
| 58 class FocusRulesImpl : public wm::BaseFocusRules { | 58 class FocusRulesImpl : public wm::BaseFocusRules { |
| 59 public: | 59 public: |
| 60 FocusRulesImpl() {} | 60 FocusRulesImpl() {} |
| 61 ~FocusRulesImpl() override {} | 61 ~FocusRulesImpl() override {} |
| 62 | 62 |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 | 416 |
| 417 aura::Window* parent = window_tree_host_->window(); | 417 aura::Window* parent = window_tree_host_->window(); |
| 418 aura::Window* content = web_contents_->GetNativeView(); | 418 aura::Window* content = web_contents_->GetNativeView(); |
| 419 if (!parent->Contains(content)) | 419 if (!parent->Contains(content)) |
| 420 parent->AddChild(content); | 420 parent->AddChild(content); |
| 421 content->Show(); | 421 content->Show(); |
| 422 } | 422 } |
| 423 | 423 |
| 424 } // namespace engine | 424 } // namespace engine |
| 425 } // namespace blimp | 425 } // namespace blimp |
| OLD | NEW |