OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "ash/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/app_list/app_list.h" | 9 #include "ash/app_list/app_list.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 layout_manager->OnWindowResized(); | 582 layout_manager->OnWindowResized(); |
583 } | 583 } |
584 } | 584 } |
585 | 585 |
586 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( | 586 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( |
587 views::Widget* widget) { | 587 views::Widget* widget) { |
588 if (CommandLine::ForCurrentProcess()->HasSwitch( | 588 if (CommandLine::ForCurrentProcess()->HasSwitch( |
589 switches::kAuraGoogleDialogFrames)) { | 589 switches::kAuraGoogleDialogFrames)) { |
590 return new internal::DialogFrameView; | 590 return new internal::DialogFrameView; |
591 } | 591 } |
592 if (CommandLine::ForCurrentProcess()->HasSwitch( | 592 // Normal non-compact-mode gets translucent-style window frames for dialogs. |
593 switches::kAuraTranslucentFrames)) { | 593 if (!IsWindowModeCompact()) { |
594 internal::CustomFrameViewAsh* frame_view = new internal::CustomFrameViewAsh; | 594 internal::CustomFrameViewAsh* frame_view = new internal::CustomFrameViewAsh; |
595 frame_view->Init(widget); | 595 frame_view->Init(widget); |
596 return frame_view; | 596 return frame_view; |
597 } | 597 } |
598 return NULL; | 598 return NULL; |
599 } | 599 } |
600 | 600 |
601 void Shell::RotateFocus(Direction direction) { | 601 void Shell::RotateFocus(Direction direction) { |
602 focus_cycler_->RotateFocus( | 602 focus_cycler_->RotateFocus( |
603 direction == FORWARD ? internal::FocusCycler::FORWARD : | 603 direction == FORWARD ? internal::FocusCycler::FORWARD : |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 void Shell::ResetLayoutManager(int container_id) { | 670 void Shell::ResetLayoutManager(int container_id) { |
671 GetContainer(container_id)->SetLayoutManager(NULL); | 671 GetContainer(container_id)->SetLayoutManager(NULL); |
672 } | 672 } |
673 | 673 |
674 void Shell::DisableWorkspaceGridLayout() { | 674 void Shell::DisableWorkspaceGridLayout() { |
675 if (workspace_controller_.get()) | 675 if (workspace_controller_.get()) |
676 workspace_controller_->workspace_manager()->set_grid_size(0); | 676 workspace_controller_->workspace_manager()->set_grid_size(0); |
677 } | 677 } |
678 | 678 |
679 } // namespace ash | 679 } // namespace ash |
OLD | NEW |