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

Side by Side Diff: athena/wm/split_view_controller.h

Issue 468763002: athena: Fix switching windows with title-drag in split-view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | athena/wm/split_view_controller.cc » ('j') | athena/wm/split_view_controller.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ 5 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
6 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ 6 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
7 7
8 #include "athena/wm/bezel_controller.h" 8 #include "athena/wm/bezel_controller.h"
9 #include "athena/wm/public/window_manager_observer.h" 9 #include "athena/wm/public/window_manager_observer.h"
10 #include "athena/wm/window_overview_mode.h" 10 #include "athena/wm/window_overview_mode.h"
(...skipping 17 matching lines...) Expand all
28 SplitViewController(aura::Window* container, 28 SplitViewController(aura::Window* container,
29 WindowListProvider* window_list_provider, 29 WindowListProvider* window_list_provider,
30 WindowManager* window_manager); 30 WindowManager* window_manager);
31 31
32 virtual ~SplitViewController(); 32 virtual ~SplitViewController();
33 33
34 bool IsSplitViewModeActive() const; 34 bool IsSplitViewModeActive() const;
35 35
36 void ActivateSplitMode(aura::Window* left, aura::Window* right); 36 void ActivateSplitMode(aura::Window* left, aura::Window* right);
37 37
38 void ReplaceWindow(aura::Window* window,
39 aura::Window* replace_with);
40
41 aura::Window* left_window() { return left_window_; }
42 aura::Window* right_window() { return right_window_; }
43
38 private: 44 private:
39 enum State { 45 enum State {
40 // Split View mode is not active. |left_window_| and |right_window| are 46 // Split View mode is not active. |left_window_| and |right_window| are
41 // NULL. 47 // NULL.
42 INACTIVE, 48 INACTIVE,
43 // Two windows |left_window_| and |right_window| are shown side by side and 49 // Two windows |left_window_| and |right_window| are shown side by side and
44 // there is a horizontal scroll in progress which is dragging the separator 50 // there is a horizontal scroll in progress which is dragging the separator
45 // between the two windows. 51 // between the two windows.
46 SCROLLING, 52 SCROLLING,
47 // Split View mode is active with |left_window_| and |right_window| showing 53 // Split View mode is active with |left_window_| and |right_window| showing
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 int separator_position_; 106 int separator_position_;
101 107
102 base::WeakPtrFactory<SplitViewController> weak_factory_; 108 base::WeakPtrFactory<SplitViewController> weak_factory_;
103 109
104 DISALLOW_COPY_AND_ASSIGN(SplitViewController); 110 DISALLOW_COPY_AND_ASSIGN(SplitViewController);
105 }; 111 };
106 112
107 } // namespace athena 113 } // namespace athena
108 114
109 #endif // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ 115 #endif // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | athena/wm/split_view_controller.cc » ('j') | athena/wm/split_view_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698