| 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/client/app/linux/blimp_client_session_linux.h" | 5 #include "blimp/client/app/linux/blimp_client_session_linux.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 const std::string& title) { | 52 const std::string& title) { |
| 53 DVLOG(1) << "Title changed to " << title << " in tab " << tab_id; | 53 DVLOG(1) << "Title changed to " << title << " in tab " << tab_id; |
| 54 } | 54 } |
| 55 | 55 |
| 56 void FakeNavigationFeatureDelegate::OnLoadingChanged(int tab_id, bool loading) { | 56 void FakeNavigationFeatureDelegate::OnLoadingChanged(int tab_id, bool loading) { |
| 57 DVLOG(1) << "Loading status changed to " << loading << " in tab " << tab_id; | 57 DVLOG(1) << "Loading status changed to " << loading << " in tab " << tab_id; |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace | 60 } // namespace |
| 61 | 61 |
| 62 BlimpClientSessionLinux::BlimpClientSessionLinux( | 62 BlimpClientSessionLinux::BlimpClientSessionLinux() |
| 63 scoped_ptr<AssignmentSource> assignment_source) | 63 : event_source_(ui::PlatformEventSource::CreateDefault()), |
| 64 : BlimpClientSession(std::move(assignment_source)), | |
| 65 event_source_(ui::PlatformEventSource::CreateDefault()), | |
| 66 navigation_feature_delegate_(new FakeNavigationFeatureDelegate) { | 64 navigation_feature_delegate_(new FakeNavigationFeatureDelegate) { |
| 67 blimp_display_manager_.reset(new BlimpDisplayManager(gfx::Size(800, 600), | 65 blimp_display_manager_.reset(new BlimpDisplayManager(gfx::Size(800, 600), |
| 68 this, | 66 this, |
| 69 GetRenderWidgetFeature(), | 67 GetRenderWidgetFeature(), |
| 70 GetTabControlFeature())); | 68 GetTabControlFeature())); |
| 71 GetNavigationFeature()->SetDelegate(kDummyTabId, | 69 GetNavigationFeature()->SetDelegate(kDummyTabId, |
| 72 navigation_feature_delegate_.get()); | 70 navigation_feature_delegate_.get()); |
| 73 } | 71 } |
| 74 | 72 |
| 75 BlimpClientSessionLinux::~BlimpClientSessionLinux() {} | 73 BlimpClientSessionLinux::~BlimpClientSessionLinux() {} |
| 76 | 74 |
| 77 void BlimpClientSessionLinux::OnClosed() { | 75 void BlimpClientSessionLinux::OnClosed() { |
| 78 base::MessageLoop::current()->QuitNow(); | 76 base::MessageLoop::current()->QuitNow(); |
| 79 } | 77 } |
| 80 | 78 |
| 81 } // namespace client | 79 } // namespace client |
| 82 } // namespace blimp | 80 } // namespace blimp |
| OLD | NEW |