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 "win8/metro_driver/stdafx.h" | 5 #include "win8/metro_driver/stdafx.h" |
6 #include "win8/metro_driver/chrome_app_view.h" | 6 #include "win8/metro_driver/chrome_app_view.h" |
7 #include "win8/metro_driver/direct3d_helper.h" | 7 #include "win8/metro_driver/direct3d_helper.h" |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <windows.applicationModel.datatransfer.h> | 10 #include <windows.applicationModel.datatransfer.h> |
11 #include <windows.foundation.h> | 11 #include <windows.foundation.h> |
12 | 12 |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
15 #include "base/win/metro.h" | 15 #include "base/win/metro.h" |
16 | 16 |
17 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
18 #include "ipc/ipc_channel.h" | 18 #include "ipc/ipc_channel.h" |
19 #include "ipc/ipc_channel_proxy.h" | 19 #include "ipc/ipc_channel_proxy.h" |
20 #include "ipc/ipc_sender.h" | 20 #include "ipc/ipc_sender.h" |
21 #include "ui/gfx/native_widget_types.h" | 21 #include "ui/gfx/native_widget_types.h" |
22 #include "ui/metro_viewer/metro_viewer_messages.h" | 22 #include "ui/metro_viewer/metro_viewer_messages.h" |
23 | 23 |
24 // This include allows to send WM_SYSCOMMANDs to chrome. | 24 // This include allows to send WM_SYSCOMMANDs to chrome. |
25 #include "chrome/app/chrome_command_ids.h" | 25 #include "chrome/app/chrome_command_ids.h" |
26 #include "win8/metro_driver/winrt_utils.h" | 26 #include "win8/metro_driver/winrt_utils.h" |
27 #include "ui/base/ui_base_switches.h" | 27 #include "ui/base/ui_base_switches.h" |
28 | 28 |
29 | |
cpu_(ooo_6.6-7.5)
2012/10/19 19:39:08
I'll take care of this whitespace. Please remove f
benwells
2012/10/22 06:20:47
Done.
| |
30 typedef winfoundtn::ITypedEventHandler< | 29 typedef winfoundtn::ITypedEventHandler< |
31 winapp::Core::CoreApplicationView*, | 30 winapp::Core::CoreApplicationView*, |
32 winapp::Activation::IActivatedEventArgs*> ActivatedHandler; | 31 winapp::Activation::IActivatedEventArgs*> ActivatedHandler; |
33 | 32 |
34 typedef winfoundtn::ITypedEventHandler< | 33 typedef winfoundtn::ITypedEventHandler< |
35 winui::Core::CoreWindow*, | 34 winui::Core::CoreWindow*, |
36 winui::Core::WindowSizeChangedEventArgs*> SizeChangedHandler; | 35 winui::Core::WindowSizeChangedEventArgs*> SizeChangedHandler; |
37 | 36 |
38 typedef winfoundtn::ITypedEventHandler< | 37 typedef winfoundtn::ITypedEventHandler< |
39 winui::Input::EdgeGesture*, | 38 winui::Input::EdgeGesture*, |
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1328 CheckHR(core_app.As(&app_exit)); | 1327 CheckHR(core_app.As(&app_exit)); |
1329 globals.app_exit = app_exit.Detach(); | 1328 globals.app_exit = app_exit.Detach(); |
1330 } | 1329 } |
1331 | 1330 |
1332 IFACEMETHODIMP | 1331 IFACEMETHODIMP |
1333 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) { | 1332 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) { |
1334 globals.view = mswr::Make<ChromeAppView>().Detach(); | 1333 globals.view = mswr::Make<ChromeAppView>().Detach(); |
1335 *view = globals.view; | 1334 *view = globals.view; |
1336 return (*view) ? S_OK : E_OUTOFMEMORY; | 1335 return (*view) ? S_OK : E_OUTOFMEMORY; |
1337 } | 1336 } |
OLD | NEW |