Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1250)

Unified Diff: athena/wm/window_manager_impl.cc

Issue 459613008: athena: Allow getting into split-view mode from overview-mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/wm/split_view_controller.cc ('k') | athena/wm/window_overview_mode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_manager_impl.cc
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
index 37daf437242a9a79c8a042e3c4521cf90b0632a1..4d75263d4268a26d480ebc0856b7b987a050fca7 100644
--- a/athena/wm/window_manager_impl.cc
+++ b/athena/wm/window_manager_impl.cc
@@ -60,6 +60,8 @@ class WindowManagerImpl : public WindowManager,
// WindowOverviewModeDelegate:
virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
+ virtual void OnSplitViewMode(aura::Window* left,
+ aura::Window* right) OVERRIDE;
// aura::WindowObserver
virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
@@ -211,6 +213,12 @@ void WindowManagerImpl::OnSelectWindow(aura::Window* window) {
SetInOverview(false);
}
+void WindowManagerImpl::OnSplitViewMode(aura::Window* left,
+ aura::Window* right) {
+ SetInOverview(false);
+ split_view_controller_->ActivateSplitMode(left, right);
+}
+
void WindowManagerImpl::OnWindowAdded(aura::Window* new_window) {
if (new_window->type() == ui::wm::WINDOW_TYPE_NORMAL)
SetInOverview(false);
« no previous file with comments | « athena/wm/split_view_controller.cc ('k') | athena/wm/window_overview_mode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698