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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 layout_manager->OnWindowResized(); | 577 layout_manager->OnWindowResized(); |
578 } | 578 } |
579 } | 579 } |
580 | 580 |
581 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( | 581 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( |
582 views::Widget* widget) { | 582 views::Widget* widget) { |
583 if (CommandLine::ForCurrentProcess()->HasSwitch( | 583 if (CommandLine::ForCurrentProcess()->HasSwitch( |
584 switches::kAuraGoogleDialogFrames)) { | 584 switches::kAuraGoogleDialogFrames)) { |
585 return new internal::DialogFrameView; | 585 return new internal::DialogFrameView; |
586 } | 586 } |
587 if (CommandLine::ForCurrentProcess()->HasSwitch( | 587 // Normal non-compact-mode gets translucent-style window frames for dialogs. |
588 switches::kAuraTranslucentFrames)) { | 588 if (!IsWindowModeCompact()) { |
589 internal::CustomFrameViewAsh* frame_view = new internal::CustomFrameViewAsh; | 589 internal::CustomFrameViewAsh* frame_view = new internal::CustomFrameViewAsh; |
590 frame_view->Init(widget); | 590 frame_view->Init(widget); |
591 return frame_view; | 591 return frame_view; |
592 } | 592 } |
593 return NULL; | 593 return NULL; |
594 } | 594 } |
595 | 595 |
596 void Shell::RotateFocus(Direction direction) { | 596 void Shell::RotateFocus(Direction direction) { |
597 focus_cycler_->RotateFocus( | 597 focus_cycler_->RotateFocus( |
598 direction == FORWARD ? internal::FocusCycler::FORWARD : | 598 direction == FORWARD ? internal::FocusCycler::FORWARD : |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
665 void Shell::ResetLayoutManager(int container_id) { | 665 void Shell::ResetLayoutManager(int container_id) { |
666 GetContainer(container_id)->SetLayoutManager(NULL); | 666 GetContainer(container_id)->SetLayoutManager(NULL); |
667 } | 667 } |
668 | 668 |
669 void Shell::DisableWorkspaceGridLayout() { | 669 void Shell::DisableWorkspaceGridLayout() { |
670 if (workspace_controller_.get()) | 670 if (workspace_controller_.get()) |
671 workspace_controller_->workspace_manager()->set_grid_size(0); | 671 workspace_controller_->workspace_manager()->set_grid_size(0); |
672 } | 672 } |
673 | 673 |
674 } // namespace ash | 674 } // namespace ash |
OLD | NEW |