diff options
author | rjkroege <rjkroege@chromium.org> | 2015-10-30 17:18:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-31 00:19:32 +0000 |
commit | 8078f90cf463450c215e1ec898e9a152b570e8d8 (patch) | |
tree | 129902e4bea9cc695392e98a6481ced962ebf974 /remoting/host/local_input_monitor_win.cc | |
parent | a6532be564b7c01e007b98e64b570d34009b34f9 (diff) | |
download | chromium_src-8078f90cf463450c215e1ec898e9a152b570e8d8.zip chromium_src-8078f90cf463450c215e1ec898e9a152b570e8d8.tar.gz chromium_src-8078f90cf463450c215e1ec898e9a152b570e8d8.tar.bz2 |
Revert of Fix chromoting host to report error when closing connection. (patchset #4 id:60001 of https://codereview.chromium.org/1430503002/ )
Reason for revert:
This change would appear to have broken the Mac build:
AILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/remoting/host/remoting_me2me_host_static.curtain_mode_mac.o.d -DBINARY_CORE=1 -DBINARY_DESKTOP=2 -DBINARY_HOST_ME2ME=3 -DBINARY_NATIVE_MESSAGING_HOST=4 -DBINARY_REMOTE_ASSISTANCE_HOST=5 -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=247874-1 -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_PRE_SYNC_BACKUP -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_WIFI_BOOTSTRAPPING=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DVERSION=48.0.2551.0 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_MAC -DWEBRTC_POSIX -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DOSX -DXML_STATIC -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2 -I../.. -Igen -I../../third_party/khronos -I../../gpu -I../../skia/config -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -Igen/policy -Igen/protoc_out -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/protobuf -I../../third_party/protobuf/src -I../../third_party/libjingle/overrides -I../../third_party/libjingle/source -I../../testing/gtest/include -I../../third_party/expat/files/lib -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -O2 -gdwarf-2 -fvisibility=hidden -Werror -Wnewline-eof -mmacosx-version-min=10.6 -arch x86_64 -Wall -Wendif-labels -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wpartial-availability -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-bitfield-width -Wexit-time-destructors -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /b/build/slave/Mac/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -fcolor-diagnostics -fno-strict-aliasing -c ../../remoting/host/curtain_mode_mac.cc -o obj/remoting/host/remoting_me2me_host_static.curtain_mode_mac.o
../../remoting/host/curtain_mode_mac.cc:212:48: error: too few arguments to function call, single argument 'error' was not specified
client_session_control_->DisconnectSession();
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
../../remoting/host/client_session_control.h:29:3: note: 'DisconnectSession' declared here
virtual void DisconnectSession(protocol::ErrorCode error) = 0;
^
1 error generated.
ninja: build stopped: subcommand failed.
http://build.chromium.org/p/chromium/builders/Mac/builds/8747
Original issue's description:
> Fix chromoting host to report error when closing connection.
>
> Previously host would often close session without reporting the reason
> to the client. Added two new error codes and updated the host to report
> session termination reason when appropriate.
>
> BUG=548261
>
> Committed: https://crrev.com/09750216bef8bc9f2953e4eee9f66801bf034fa4
> Cr-Commit-Position: refs/heads/master@{#357215}
TBR=kelvinp@chromium.org,tsepez@chromium.org,sergeyu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=548261
Review URL: https://codereview.chromium.org/1424403002
Cr-Commit-Position: refs/heads/master@{#357238}
Diffstat (limited to 'remoting/host/local_input_monitor_win.cc')
-rw-r--r-- | remoting/host/local_input_monitor_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/local_input_monitor_win.cc b/remoting/host/local_input_monitor_win.cc index 74975ec..1b92e03 100644 --- a/remoting/host/local_input_monitor_win.cc +++ b/remoting/host/local_input_monitor_win.cc @@ -133,7 +133,7 @@ void LocalInputMonitorWin::Core::StartOnUiThread() { // the session. Disconnect the session now to prevent this. caller_task_runner_->PostTask( FROM_HERE, base::Bind(&ClientSessionControl::DisconnectSession, - client_session_control_, protocol::OK)); + client_session_control_)); } } |