OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 20 matching lines...) Expand all Loading... | |
31 #include "config.h" | 31 #include "config.h" |
32 #include "WebViewImpl.h" | 32 #include "WebViewImpl.h" |
33 | 33 |
34 #include "AutofillPopupMenuClient.h" | 34 #include "AutofillPopupMenuClient.h" |
35 #include "BatteryClientImpl.h" | 35 #include "BatteryClientImpl.h" |
36 #include "BatteryController.h" | 36 #include "BatteryController.h" |
37 #include "CSSValueKeywords.h" | 37 #include "CSSValueKeywords.h" |
38 #include "CompositionUnderlineVectorBuilder.h" | 38 #include "CompositionUnderlineVectorBuilder.h" |
39 #include "ContextFeaturesClientImpl.h" | 39 #include "ContextFeaturesClientImpl.h" |
40 #include "DeviceOrientationClientProxy.h" | 40 #include "DeviceOrientationClientProxy.h" |
41 #include "modules/device_orientation/DeviceMotionController.h" | |
abarth-chromium
2013/04/29 20:32:20
Please put this include in alphabetical order.
timvolodine
2013/04/30 12:40:18
Done.
| |
41 #include "GeolocationClientProxy.h" | 42 #include "GeolocationClientProxy.h" |
42 #include "GeolocationController.h" | 43 #include "GeolocationController.h" |
43 #include "GraphicsLayerFactoryChromium.h" | 44 #include "GraphicsLayerFactoryChromium.h" |
44 #include "HTMLInputElement.h" | 45 #include "HTMLInputElement.h" |
45 #include "HTMLMediaElement.h" | 46 #include "HTMLMediaElement.h" |
46 #include "HTMLNames.h" | 47 #include "HTMLNames.h" |
47 #include "HTMLTextAreaElement.h" | 48 #include "HTMLTextAreaElement.h" |
48 #include "InspectorController.h" | 49 #include "InspectorController.h" |
49 #include "InspectorInstrumentation.h" | 50 #include "InspectorInstrumentation.h" |
50 #include "LinkHighlight.h" | 51 #include "LinkHighlight.h" |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
474 #endif | 475 #endif |
475 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get()); | 476 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get()); |
476 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) | 477 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) |
477 provideNotification(m_page.get(), notificationPresenterImpl()); | 478 provideNotification(m_page.get(), notificationPresenterImpl()); |
478 #endif | 479 #endif |
479 #if ENABLE(NAVIGATOR_CONTENT_UTILS) | 480 #if ENABLE(NAVIGATOR_CONTENT_UTILS) |
480 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g et()); | 481 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g et()); |
481 #endif | 482 #endif |
482 | 483 |
483 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get()); | 484 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get()); |
485 provideDeviceMotionTo(m_page.get()); | |
abarth-chromium
2013/04/29 20:32:20
This shouldn't be needed. This sort of thing is o
timvolodine
2013/04/30 12:40:18
DeviceMotionController is still a supplement of a
| |
484 provideDeviceOrientationTo(m_page.get(), m_deviceOrientationClientProxy.get( )); | 486 provideDeviceOrientationTo(m_page.get(), m_deviceOrientationClientProxy.get( )); |
485 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get()); | 487 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get()); |
486 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); | 488 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); |
487 | 489 |
488 #if ENABLE(BATTERY_STATUS) | 490 #if ENABLE(BATTERY_STATUS) |
489 provideBatteryTo(m_page.get(), m_batteryClient.get()); | 491 provideBatteryTo(m_page.get(), m_batteryClient.get()); |
490 m_batteryClient->setController(BatteryController::from(m_page.get())); | 492 m_batteryClient->setController(BatteryController::from(m_page.get())); |
491 #endif | 493 #endif |
492 | 494 |
493 m_page->setGroupType(Page::SharedPageGroup); | 495 m_page->setGroupType(Page::SharedPageGroup); |
(...skipping 3719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4213 } | 4215 } |
4214 | 4216 |
4215 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 4217 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
4216 { | 4218 { |
4217 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); | 4219 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); |
4218 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom | 4220 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom |
4219 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); | 4221 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); |
4220 } | 4222 } |
4221 | 4223 |
4222 } // namespace WebKit | 4224 } // namespace WebKit |
OLD | NEW |