summaryrefslogtreecommitdiffstats
path: root/components/mus/ws/window_tree_unittest.cc
diff options
context:
space:
mode:
authortzik <tzik@chromium.org>2015-12-10 20:17:58 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-11 04:18:39 +0000
commite09536a2acfca1d1273ed26209ba38b9fcb2455c (patch)
treecaac684186181f6067d5359f593709400ab2579f /components/mus/ws/window_tree_unittest.cc
parenta35adb00df54eca9e5aaf4b7bf2548647f2a4597 (diff)
downloadchromium_src-e09536a2acfca1d1273ed26209ba38b9fcb2455c.zip
chromium_src-e09536a2acfca1d1273ed26209ba38b9fcb2455c.tar.gz
chromium_src-e09536a2acfca1d1273ed26209ba38b9fcb2455c.tar.bz2
Revert of Routes close requests from WM to client (patchset #4 id:50001 of https://codereview.chromium.org/1518593003/ )
Reason for revert: This seems to break windows build for a link error, that is probably a visibility issue. The error log is: http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/14955 browser_window.obj :error LNK2001: unresolved external symbol "public: virtual void __cdecl aura::WindowTreeHostObserver::OnHostMoved(class aura::WindowTreeHost const *,class gfx::Point const &)" (?OnHostMoved@WindowTreeHostObserver@aura@@UEAAXPEBVWindowTreeHost@2@AEBVPoint@gfx@@@Z) browser_window.obj :error LNK2001: unresolved external symbol "public: virtual void __cdecl aura::WindowTreeHostObserver::OnHostResized(class aura::WindowTreeHost const *)" (?OnHostResized@WindowTreeHostObserver@aura@@UEAAXPEBVWindowTreeHost@2@@Z) ./desktop_ui_library.dll : fatalerror LNK1120: 2 unresolved externals Original issue's description: > Routes close requests from WM to client > > Adds WindowTree::WmRequestClose(). The WM invokes this when the user > clicks the close button. This calls to > WindowTreeClient::RequestClose() so that the client can close the > window (if it wants to). > > In getting this to work I had to straighten out shutdown of > NativeWidgetMus. Previously we keyed off the aura::Window going > away and tried to do somethings if the mus::Window went away. I've > centralized it so we cleanup when the mus::Window goes away. > > BUG=none > TEST=none > R=ben@chromium.org > > Committed: https://crrev.com/359ce52f32bf5d8ecbe7b719af983aa878f0e0de > Cr-Commit-Position: refs/heads/master@{#364606} TBR=ben@chromium.org,sky@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=none Review URL: https://codereview.chromium.org/1509733009 Cr-Commit-Position: refs/heads/master@{#364612}
Diffstat (limited to 'components/mus/ws/window_tree_unittest.cc')
-rw-r--r--components/mus/ws/window_tree_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/components/mus/ws/window_tree_unittest.cc b/components/mus/ws/window_tree_unittest.cc
index 5096093..71fd138 100644
--- a/components/mus/ws/window_tree_unittest.cc
+++ b/components/mus/ws/window_tree_unittest.cc
@@ -127,12 +127,11 @@ class TestWindowTreeClient : public mus::mojom::WindowTreeClient {
void OnWindowFocused(uint32_t focused_window_id) override {
tracker_.OnWindowFocused(focused_window_id);
}
- void OnWindowPredefinedCursorChanged(uint32_t window_id,
+ void OnWindowPredefinedCursorChanged(uint32 window_id,
mojom::Cursor cursor_id) override {
tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id);
}
void OnChangeCompleted(uint32_t change_id, bool success) override {}
- void RequestClose(uint32_t window_id) override {}
void WmSetBounds(uint32_t change_id,
Id window_id,
mojo::RectPtr bounds) override {}