| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 DCHECK_EQ(root_, view); | 135 DCHECK_EQ(root_, view); |
| 136 root_ = nullptr; | 136 root_ = nullptr; |
| 137 bitmap_uploader_.reset(); | 137 bitmap_uploader_.reset(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 // mus::InputEventHandler: | 140 // mus::InputEventHandler: |
| 141 void OnWindowInputEvent(mus::Window* view, | 141 void OnWindowInputEvent(mus::Window* view, |
| 142 mus::mojom::EventPtr event, | 142 mus::mojom::EventPtr event, |
| 143 scoped_ptr<base::Closure>* ack_callback) override { | 143 scoped_ptr<base::Closure>* ack_callback) override { |
| 144 if (event->key_data && | 144 if (event->key_data && |
| 145 (event->action != mus::mojom::EVENT_TYPE_KEY_PRESSED || | 145 (event->action != mus::mojom::EventType::KEY_PRESSED || |
| 146 event->key_data->is_char)) { | 146 event->key_data->is_char)) { |
| 147 return; | 147 return; |
| 148 } | 148 } |
| 149 | 149 |
| 150 // TODO(rjkroege): Make panning and scrolling more performant and | 150 // TODO(rjkroege): Make panning and scrolling more performant and |
| 151 // responsive to gesture events. | 151 // responsive to gesture events. |
| 152 if ((event->key_data && | 152 if ((event->key_data && |
| 153 event->key_data->windows_key_code == mus::mojom::KEYBOARD_CODE_DOWN) || | 153 event->key_data->windows_key_code == mus::mojom::KeyboardCode::DOWN) || |
| 154 (event->pointer_data && event->pointer_data->wheel_data && | 154 (event->pointer_data && event->pointer_data->wheel_data && |
| 155 event->pointer_data->wheel_data->delta_y < 0)) { | 155 event->pointer_data->wheel_data->delta_y < 0)) { |
| 156 if (current_page_ < (page_count_ - 1)) { | 156 if (current_page_ < (page_count_ - 1)) { |
| 157 current_page_++; | 157 current_page_++; |
| 158 DrawBitmap(); | 158 DrawBitmap(); |
| 159 } | 159 } |
| 160 } else if ((event->key_data && | 160 } else if ((event->key_data && |
| 161 event->key_data->windows_key_code == | 161 event->key_data->windows_key_code == |
| 162 mus::mojom::KEYBOARD_CODE_UP) || | 162 mus::mojom::KeyboardCode::UP) || |
| 163 (event->pointer_data && event->pointer_data->wheel_data && | 163 (event->pointer_data && event->pointer_data->wheel_data && |
| 164 event->pointer_data->wheel_data->delta_y > 0)) { | 164 event->pointer_data->wheel_data->delta_y > 0)) { |
| 165 if (current_page_ > 0) { | 165 if (current_page_ > 0) { |
| 166 current_page_--; | 166 current_page_--; |
| 167 DrawBitmap(); | 167 DrawBitmap(); |
| 168 } | 168 } |
| 169 } | 169 } |
| 170 } | 170 } |
| 171 | 171 |
| 172 // web_view::mojom::FrameClient: | 172 // web_view::mojom::FrameClient: |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 | 371 |
| 372 DISALLOW_COPY_AND_ASSIGN(PDFViewer); | 372 DISALLOW_COPY_AND_ASSIGN(PDFViewer); |
| 373 }; | 373 }; |
| 374 } // namespace | 374 } // namespace |
| 375 } // namespace pdf_viewer | 375 } // namespace pdf_viewer |
| 376 | 376 |
| 377 MojoResult MojoMain(MojoHandle application_request) { | 377 MojoResult MojoMain(MojoHandle application_request) { |
| 378 mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer()); | 378 mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer()); |
| 379 return runner.Run(application_request); | 379 return runner.Run(application_request); |
| 380 } | 380 } |
| OLD | NEW |