• Home
  • History
  • Annotate
  • only in /external/chromium_org/mojo/examples/
History log of /external/chromium_org/mojo/examples/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
pptest/BUILD.gn
pptest/example_service_application.cc
ura_demo/BUILD.gn
ura_demo/aura_demo.cc
ura_demo/view_manager_init.cc
rowser/BUILD.gn
rowser/browser.cc
ompositor_app/BUILD.gn
ompositor_app/compositor_app.cc
ompositor_app/compositor_host.cc
ompositor_app/compositor_host.h
ontent_handler_demo/BUILD.gn
ontent_handler_demo/content_handler_demo.cc
bus_echo/BUILD.gn
bus_echo/dbus_echo_app.cc
bus_echo/dbus_echo_service.cc
emo_launcher/BUILD.gn
emo_launcher/demo_launcher.cc
cho/BUILD.gn
cho/echo_service.mojom
mbedded_app/BUILD.gn
mbedded_app/embedded_app.cc
eyboard/BUILD.gn
eyboard/keyboard.cc
edia_viewer/BUILD.gn
edia_viewer/media_viewer.cc
esting_app/BUILD.gn
esting_app/nesting_app.cc
epper_container_app/BUILD.gn
epper_container_app/OWNERS
epper_container_app/mojo_ppapi_globals.cc
epper_container_app/pepper_container_app.cc
epper_container_app/plugin_instance.cc
epper_container_app/plugin_instance.h
epper_container_app/resource_creation_impl.cc
epper_container_app/resource_creation_impl.h
epper_container_app/type_converters.h
ng_viewer/BUILD.gn
ng_viewer/png_viewer.cc
ample_app/BUILD.gn
ample_app/DEPS
ample_app/gles2_client_impl.cc
ample_app/sample_app.cc
urfaces_app/BUILD.gn
urfaces_app/child_app.cc
urfaces_app/child_gl_app.cc
urfaces_app/child_gl_impl.cc
urfaces_app/child_gl_impl.h
urfaces_app/child_impl.cc
urfaces_app/child_impl.h
urfaces_app/embedder.cc
urfaces_app/surfaces_app.cc
get/BUILD.gn
indow_manager/BUILD.gn
indow_manager/debug_panel.cc
indow_manager/debug_panel.h
indow_manager/window_manager.cc
indow_manager/window_manager.mojom
m_flow/BUILD.gn
m_flow/app/app.cc
m_flow/embedded/embedded.cc
m_flow/init/init.cc
m_flow/wm/DEPS
m_flow/wm/frame_controller.cc
m_flow/wm/frame_controller.h
m_flow/wm/wm.cc
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
UILD.gn
pptest/example_apptest.cc
pptest/example_client_application.cc
ura_demo/DEPS
ura_demo/aura_demo.cc
ura_demo/view_manager_init.cc
rowser/DEPS
rowser/browser.cc
ompositor_app/DEPS
ompositor_app/compositor_app.cc
ompositor_app/compositor_host.cc
ompositor_app/compositor_host.h
bus_echo/dbus_echo_app.cc
emo_launcher/demo_launcher.cc
cho/BUILD.gn
cho/echo_client.cc
cho/echo_service.cc
mbedded_app/embedded_app.cc
eyboard/DEPS
eyboard/keyboard.cc
edia_viewer/media_viewer.cc
esting_app/nesting_app.cc
epper_container_app/pepper_container_app.cc
ng_viewer/png_viewer.cc
ample_app/BUILD.gn
ample_app/gles2_client_impl.cc
ample_app/sample_app.cc
urfaces_app/BUILD.gn
urfaces_app/DEPS
urfaces_app/child_app.cc
urfaces_app/child_gl_app.cc
urfaces_app/child_gl_impl.cc
urfaces_app/child_gl_impl.h
urfaces_app/child_impl.cc
urfaces_app/embedder.cc
urfaces_app/embedder.h
urfaces_app/surfaces_app.cc
get/BUILD.gn
get/wget.cc
indow_manager/window_manager.cc
m_flow/app/app.cc
m_flow/init/init.cc
m_flow/wm/wm.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
pptest/example_apptest.cc
pptest/example_client_application.cc
pptest/example_client_application.h
pptest/example_client_impl.cc
pptest/example_client_impl.h
pptest/example_service.mojom
pptest/example_service_application.cc
pptest/example_service_application.h
pptest/example_service_impl.cc
pptest/example_service_impl.h
ura_demo/aura_demo.cc
ura_demo/view_manager_init.cc
rowser/browser.cc
ompositor_app/compositor_app.cc
emo_launcher/demo_launcher.cc
mbedded_app/embedded_app.cc
eyboard/keyboard.cc
edia_viewer/media_viewer.cc
esting_app/nesting_app.cc
epper_container_app/graphics_3d_resource.cc
epper_container_app/pepper_container_app.cc
ng_viewer/png_viewer.cc
ample_app/gles2_client_impl.cc
ample_app/sample_app.cc
indow_manager/DEPS
indow_manager/debug_panel.cc
indow_manager/debug_panel.h
indow_manager/window_manager.cc
m_flow/app/app.cc
m_flow/app/embedder.mojom
m_flow/embedded/embedded.cc
m_flow/embedded/embeddee.mojom
m_flow/init/init.cc
m_flow/wm/wm.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ura_demo/aura_demo.cc
ura_demo/view_manager_init.cc
rowser/browser.cc
ompositor_app/compositor_app.cc
ompositor_app/compositor_host.cc
ontent_handler_demo/content_handler_demo.cc
bus_echo/dbus_echo_app.cc
emo_launcher/demo_launcher.cc
cho/echo_client.cc
cho/echo_service.cc
cho/echo_service.mojom
mbedded_app/embedded_app.cc
eyboard/keyboard.cc
edia_viewer/media_viewer.cc
esting_app/nesting_app.cc
epper_container_app/graphics_3d_resource.cc
epper_container_app/graphics_3d_resource.h
epper_container_app/pepper_container_app.cc
ng_viewer/png_viewer.cc
ample_app/DEPS
ample_app/gles2_client_impl.cc
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
urfaces_app/child.mojom
urfaces_app/child_app.cc
urfaces_app/child_impl.cc
urfaces_app/child_impl.h
urfaces_app/embedder.cc
urfaces_app/embedder.h
urfaces_app/surfaces_app.cc
get/wget.cc
indow_manager/debug_panel.cc
indow_manager/debug_panel.h
indow_manager/window_manager.cc
m_flow/app/DEPS
m_flow/app/app.cc
m_flow/init/init.cc
m_flow/wm/DEPS
m_flow/wm/wm.cc
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ura_demo/aura_demo.cc
ura_demo/view_manager_init.cc
rowser/browser.cc
ompositor_app/compositor_app.cc
bus_echo/dbus_echo_app.cc
emo_launcher/demo_launcher.cc
mbedded_app/embedded_app.cc
tml_viewer/DEPS
tml_viewer/blink_platform_impl.cc
tml_viewer/blink_platform_impl.h
tml_viewer/html_document_view.cc
tml_viewer/html_document_view.h
tml_viewer/html_viewer.cc
tml_viewer/webmimeregistry_impl.cc
tml_viewer/webmimeregistry_impl.h
tml_viewer/webthread_impl.cc
tml_viewer/webthread_impl.h
tml_viewer/weburlloader_impl.cc
tml_viewer/weburlloader_impl.h
mage_viewer/DEPS
mage_viewer/image_viewer.cc
eyboard/DEPS
eyboard/keyboard.cc
eyboard/keyboard.mojom
eyboard/keyboard_delegate.h
eyboard/keyboard_view.cc
eyboard/keyboard_view.h
eyboard/keys.cc
eyboard/keys.h
edia_viewer/DEPS
edia_viewer/media_viewer.cc
edia_viewer/media_viewer.mojom
esting_app/nesting_app.cc
epper_container_app/graphics_3d_resource.cc
epper_container_app/graphics_3d_resource.h
epper_container_app/pepper_container_app.cc
ng_viewer/DEPS
ng_viewer/png_viewer.cc
ample_app/gles2_client_impl.cc
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
ample_app/spinning_cube.cc
ample_app/spinning_cube.h
urfaces_app/DEPS
urfaces_app/child.mojom
urfaces_app/child_app.cc
urfaces_app/child_impl.cc
urfaces_app/child_impl.h
urfaces_app/embedder.cc
urfaces_app/embedder.h
urfaces_app/surfaces_app.cc
urfaces_app/surfaces_util.cc
urfaces_app/surfaces_util.h
get/wget.cc
indow_manager/DEPS
indow_manager/debug_panel.cc
indow_manager/debug_panel.h
indow_manager/window_manager.cc
indow_manager/window_manager.mojom
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ura_demo/aura_demo.cc
rowser/browser.cc
mbedded_app/embedded_app.cc
tml_viewer/DEPS
tml_viewer/blink_platform_impl.cc
tml_viewer/blink_platform_impl.h
tml_viewer/html_document_view.cc
tml_viewer/html_document_view.h
tml_viewer/html_viewer.cc
tml_viewer/webmimeregistry_impl.cc
tml_viewer/webmimeregistry_impl.h
tml_viewer/webthread_impl.cc
tml_viewer/webthread_impl.h
tml_viewer/weburlloader_impl.cc
tml_viewer/weburlloader_impl.h
mage_viewer/image_viewer.cc
esting_app/nesting_app.cc
indow_manager/window_manager.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ura_demo/aura_demo.cc
ura_demo/context_factory_view_manager.cc
ura_demo/context_factory_view_manager.h
ura_demo/view_manager_init.cc
ura_demo/window_tree_host_view_manager.cc
ura_demo/window_tree_host_view_manager.h
rowser/DEPS
rowser/browser.cc
ompositor_app/compositor_app.cc
emo_launcher/demo_launcher.cc
mbedded_app/embedded_app.cc
tml_viewer/html_viewer.cc
mage_viewer/DEPS
mage_viewer/image_viewer.cc
esting_app/DEPS
esting_app/nesting_app.cc
epper_container_app/pepper_container_app.cc
epper_container_app/plugin_instance.cc
epper_container_app/plugin_instance.h
epper_container_app/type_converters.h
ample_app/gles2_client_impl.cc
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
get/wget.cc
indow_manager/window_manager.cc
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ura_demo/DEPS
ura_demo/aura_demo.cc
ura_demo/context_factory_view_manager.cc
ura_demo/context_factory_view_manager.h
ura_demo/view_manager_init.cc
ura_demo/window_tree_host_view_manager.cc
ura_demo/window_tree_host_view_manager.h
emo_launcher/demo_launcher.cc
mbedded_app/DEPS
mbedded_app/embedded_app.cc
auncher/DEPS
auncher/launcher.cc
auncher/launcher.mojom
epper_container_app/plugin_instance.cc
epper_container_app/plugin_instance.h
epper_container_app/resource_creation_impl.cc
epper_container_app/resource_creation_impl.h
ample_view_manager_app/DEPS
ample_view_manager_app/sample_view_manager_app.cc
get/wget.cc
indow_manager/DEPS
indow_manager/window_manager.cc
indow_manager/window_manager.mojom
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ura_demo/aura_demo.cc
ompositor_app/compositor_app.cc
ompositor_app/compositor_host.cc
ompositor_app/compositor_host.h
bus_echo/dbus_echo_app.cc
auncher/launcher.cc
epper_container_app/pepper_container_app.cc
epper_container_app/plugin_instance.cc
epper_container_app/plugin_instance.h
epper_container_app/type_converters.h
ample_app/gles2_client_impl.cc
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
ample_app/spinning_cube.cc
ample_app/spinning_cube.h
ample_view_manager_app/DEPS
ample_view_manager_app/sample_view_manager_app.cc
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
ura_demo/aura_demo.cc
ompositor_app/compositor_app.cc
bus_echo/dbus_echo_app.cc
auncher/launcher.cc
auncher/launcher.mojom
epper_container_app/pepper_container_app.cc
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
ample_view_manager_app/sample_view_manager_app.cc
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ura_demo/DEPS
ura_demo/aura_demo.cc
ura_demo/demo_context_factory.cc
ura_demo/demo_context_factory.h
ura_demo/demo_screen.cc
ura_demo/demo_screen.h
ura_demo/window_tree_host_mojo.cc
ura_demo/window_tree_host_mojo.h
ompositor_app/compositor_host.cc
ompositor_app/mojo_context_provider.cc
ompositor_app/mojo_context_provider.h
auncher/launcher.cc
epper_container_app/resource_creation_impl.cc
epper_container_app/resource_creation_impl.h
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ura_demo/demo_context_factory.cc
ura_demo/demo_context_factory.h
ura_demo/window_tree_host_mojo.cc
ura_demo/window_tree_host_mojo.h
ompositor_app/compositor_host.cc
ompositor_app/compositor_host.h
ompositor_app/mojo_context_provider.h
bus_echo/dbus_echo_app.cc
auncher/DEPS
auncher/launcher.cc
epper_container_app/OWNERS
epper_container_app/graphics_3d_resource.cc
epper_container_app/graphics_3d_resource.h
epper_container_app/type_converters.h
ample_view_manager_app/sample_view_manager_app.cc
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ample_view_manager_app/sample_view_manager_app.cc
iew_manager/DEPS
iew_manager/view_manager.cc
iew_manager/view_manager.mojom
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
ura_demo/window_tree_host_mojo.cc
ura_demo/window_tree_host_mojo.h
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
ura_demo/aura_demo.cc
ura_demo/demo_context_factory.cc
ura_demo/window_tree_host_mojo.cc
ura_demo/window_tree_host_mojo.h
ompositor_app/compositor_app.cc
auncher/launcher.cc
epper_container_app/graphics_3d_resource.cc
epper_container_app/graphics_3d_resource.h
epper_container_app/pepper_container_app.cc
epper_container_app/type_converters.h
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
iew_manager/view_manager.cc
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
ura_demo/aura_demo.cc
ura_demo/window_tree_host_mojo.cc
ompositor_app/compositor_app.cc
ompositor_app/mojo_context_provider.h
auncher/launcher.cc
epper_container_app/graphics_3d_resource.cc
epper_container_app/graphics_3d_resource.h
epper_container_app/pepper_container_app.cc
epper_container_app/ppb_opengles2_thunk.cc
ample_app/gles2_client_impl.cc
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ura_demo/aura_demo.cc
ompositor_app/compositor_app.cc
ompositor_app/compositor_host.h
ompositor_app/mojo_context_provider.h
auncher/launcher.cc
epper_container_app/DEPS
epper_container_app/graphics_3d_resource.cc
epper_container_app/graphics_3d_resource.h
epper_container_app/interface_list.cc
epper_container_app/interface_list.h
epper_container_app/mojo_ppapi_globals.cc
epper_container_app/mojo_ppapi_globals.h
epper_container_app/pepper_container_app.cc
epper_container_app/plugin_instance.cc
epper_container_app/plugin_instance.h
epper_container_app/plugin_module.cc
epper_container_app/plugin_module.h
epper_container_app/ppb_core_thunk.cc
epper_container_app/ppb_opengles2_thunk.cc
epper_container_app/resource_creation_impl.cc
epper_container_app/resource_creation_impl.h
epper_container_app/thunk.h
epper_container_app/type_converters.h
ample_app/sample_app.cc
iew_manager/view_manager.cc
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ura_demo/window_tree_host_mojo.cc
ura_demo/window_tree_host_mojo.h
ompositor_app/compositor_app.cc
auncher/launcher.cc
iew_manager/view_manager.cc
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ura_demo/aura_demo.cc
ura_demo/demo_context_factory.cc
ura_demo/window_tree_host_mojo.cc
ura_demo/window_tree_host_mojo.h
ompositor_app/compositor_app.cc
auncher/launcher.cc
auncher/launcher.mojom
ample_app/gles2_client_impl.h
ample_app/sample_app.cc
iew_manager/view_manager.cc
iew_manager/view_manager.mojom
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ura_demo/DEPS
ura_demo/aura_demo.cc
ura_demo/demo_context_factory.cc
ura_demo/demo_context_factory.h
ura_demo/demo_screen.cc
ura_demo/demo_screen.h
ura_demo/window_tree_host_mojo.cc
ura_demo/window_tree_host_mojo.h
ompositor_app/DEPS
ompositor_app/compositor_app.cc
ompositor_app/compositor_host.cc
ompositor_app/compositor_host.h
ompositor_app/mojo_context_provider.cc
ompositor_app/mojo_context_provider.h
ello_world_service/hello_world_service.mojom
ello_world_service/hello_world_service_impl.cc
ello_world_service/hello_world_service_impl.h
auncher/DEPS
auncher/launcher.cc
auncher/launcher.mojom
ample_app/gles2_client_impl.cc
ample_app/gles2_client_impl.h
ample_app/native_viewport_client_impl.cc
ample_app/native_viewport_client_impl.h
ample_app/sample_app.cc
iew_manager/DEPS
iew_manager/view_manager.cc
iew_manager/view_manager.mojom
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ello_world_service/hello_world_service_impl.cc
ello_world_service/hello_world_service_impl.h
ample_app/DEPS
ample_app/gles2_client_impl.cc
ample_app/gles2_client_impl.h
ample_app/native_viewport_client_impl.cc
ample_app/native_viewport_client_impl.h
ample_app/sample_app.cc
ample_app/spinning_cube.cc
ample_app/spinning_cube.h
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ello_world_service/hello_world_service.mojom
ello_world_service/hello_world_service_impl.cc
ello_world_service/hello_world_service_impl.h
ample_app/DEPS
ample_app/native_viewport_client_impl.cc
ample_app/native_viewport_client_impl.h
ample_app/sample_app.cc
ample_app/spinning_cube.cc
ample_app/spinning_cube.h
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ample_app/sample_app.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ample_app/sample_app.cc