OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "remoting/client/plugin/chromoting_instance.h" | 5 #include "remoting/client/plugin/chromoting_instance.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include <nacl_io/nacl_io.h> | 10 #include <nacl_io/nacl_io.h> |
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
551 } else if (key_filter == "cros") { | 551 } else if (key_filter == "cros") { |
552 normalizing_input_filter_.reset( | 552 normalizing_input_filter_.reset( |
553 new NormalizingInputFilterCros(&key_mapper_)); | 553 new NormalizingInputFilterCros(&key_mapper_)); |
554 } else { | 554 } else { |
555 DCHECK(key_filter.empty()); | 555 DCHECK(key_filter.empty()); |
556 normalizing_input_filter_.reset(new protocol::InputFilter(&key_mapper_)); | 556 normalizing_input_filter_.reset(new protocol::InputFilter(&key_mapper_)); |
557 } | 557 } |
558 input_handler_.set_input_stub(normalizing_input_filter_.get()); | 558 input_handler_.set_input_stub(normalizing_input_filter_.get()); |
559 | 559 |
560 // Try initializing 3D video renderer. | 560 // Try initializing 3D video renderer. |
561 video_renderer_.reset(new PepperVideoRenderer3D()); | 561 // video_renderer_.reset(new PepperVideoRenderer3D()); |
562 if (!video_renderer_->Initialize(this, context_, this)) | 562 // if (!video_renderer_->Initialize(this, context_, this)) |
563 video_renderer_.reset(); | 563 // video_renderer_.reset(); |
Jamie
2015/08/19 20:52:10
Did you leave this commented out intentionally? If
Sergey Ulanov
2015/08/19 23:37:13
No. Commented it just to test the other changes in
| |
564 | 564 |
565 // If we didn't initialize 3D renderer then use the 2D renderer. | 565 // If we didn't initialize 3D renderer then use the 2D renderer. |
566 if (!video_renderer_) { | 566 if (!video_renderer_) { |
567 LOG(WARNING) | 567 LOG(WARNING) |
568 << "Failed to initialize 3D renderer. Using 2D renderer instead."; | 568 << "Failed to initialize 3D renderer. Using 2D renderer instead."; |
569 video_renderer_.reset(new PepperVideoRenderer2D()); | 569 video_renderer_.reset(new PepperVideoRenderer2D()); |
570 if (!video_renderer_->Initialize(this, context_, this)) | 570 if (!video_renderer_->Initialize(this, context_, this)) |
571 video_renderer_.reset(); | 571 video_renderer_.reset(); |
572 } | 572 } |
573 | 573 |
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1074 | 1074 |
1075 if (is_custom_counts_histogram) | 1075 if (is_custom_counts_histogram) |
1076 uma.HistogramCustomCounts(histogram_name, value, histogram_min, | 1076 uma.HistogramCustomCounts(histogram_name, value, histogram_min, |
1077 histogram_max, histogram_buckets); | 1077 histogram_max, histogram_buckets); |
1078 else | 1078 else |
1079 uma.HistogramCustomTimes(histogram_name, value, histogram_min, | 1079 uma.HistogramCustomTimes(histogram_name, value, histogram_min, |
1080 histogram_max, histogram_buckets); | 1080 histogram_max, histogram_buckets); |
1081 } | 1081 } |
1082 | 1082 |
1083 } // namespace remoting | 1083 } // namespace remoting |
OLD | NEW |