| Index: ash/wm/workspace/workspace_manager.cc
|
| diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc
|
| index 098c4e91a52de89c20abc818d9360a171af33f14..f1306fb8c4e9144637c6e6f7bce9be475bcb094d 100644
|
| --- a/ash/wm/workspace/workspace_manager.cc
|
| +++ b/ash/wm/workspace/workspace_manager.cc
|
| @@ -64,9 +64,6 @@ namespace internal {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // WindowManager, public:
|
|
|
| -// static
|
| -const int WorkspaceManager::kOpenMaximizedThreshold = 1600;
|
| -
|
| WorkspaceManager::WorkspaceManager(aura::Window* contents_view)
|
| : contents_view_(contents_view),
|
| active_workspace_(NULL),
|
| @@ -75,7 +72,6 @@ WorkspaceManager::WorkspaceManager(aura::Window* contents_view)
|
| is_overview_(false),
|
| ignored_window_(NULL),
|
| grid_size_(0),
|
| - open_new_windows_maximized_(true),
|
| shelf_(NULL) {
|
| DCHECK(contents_view);
|
| }
|
| @@ -95,12 +91,6 @@ bool WorkspaceManager::IsManagedWindow(aura::Window* window) const {
|
| !window->transient_parent();
|
| }
|
|
|
| -bool WorkspaceManager::ShouldMaximize(aura::Window* window) const {
|
| - return !window->GetProperty(aura::client::kShowStateKey) &&
|
| - open_new_windows_maximized_ &&
|
| - contents_view_->bounds().width() < kOpenMaximizedThreshold;
|
| -}
|
| -
|
| void WorkspaceManager::AddWindow(aura::Window* window) {
|
| DCHECK(IsManagedWindow(window));
|
|
|
| @@ -119,14 +109,8 @@ void WorkspaceManager::AddWindow(aura::Window* window) {
|
| SetRestoreBounds(window, window->bounds());
|
| }
|
|
|
| - if (!window->GetProperty(aura::client::kShowStateKey)) {
|
| - if (ShouldMaximize(window)) {
|
| - window->SetProperty(aura::client::kShowStateKey,
|
| - ui::SHOW_STATE_MAXIMIZED);
|
| - } else {
|
| - window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
|
| - }
|
| - }
|
| + if (!window->GetProperty(aura::client::kShowStateKey))
|
| + window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
|
|
|
| if (wm::IsWindowMaximized(window) || wm::IsWindowFullscreen(window)) {
|
| SetFullScreenOrMaximizedBounds(window);
|
|
|