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 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/accelerators/focus_manager_factory.h" | 10 #include "ash/accelerators/focus_manager_factory.h" |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
640 } | 640 } |
641 } | 641 } |
642 } | 642 } |
643 return false; | 643 return false; |
644 } | 644 } |
645 | 645 |
646 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( | 646 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( |
647 views::Widget* widget) { | 647 views::Widget* widget) { |
648 if (CommandLine::ForCurrentProcess()->HasSwitch( | 648 if (CommandLine::ForCurrentProcess()->HasSwitch( |
649 ::switches::kEnableNewDialogStyle)) { | 649 ::switches::kEnableNewDialogStyle)) { |
650 return new views::DialogFrameView; | 650 return new views::DialogFrameView(string16()); |
651 } | 651 } |
652 // Use translucent-style window frames for dialogs. | 652 // Use translucent-style window frames for dialogs. |
653 CustomFrameViewAsh* frame_view = new CustomFrameViewAsh; | 653 CustomFrameViewAsh* frame_view = new CustomFrameViewAsh; |
654 frame_view->Init(widget); | 654 frame_view->Init(widget); |
655 return frame_view; | 655 return frame_view; |
656 } | 656 } |
657 | 657 |
658 void Shell::RotateFocus(Direction direction) { | 658 void Shell::RotateFocus(Direction direction) { |
659 focus_cycler_->RotateFocus( | 659 focus_cycler_->RotateFocus( |
660 direction == FORWARD ? internal::FocusCycler::FORWARD : | 660 direction == FORWARD ? internal::FocusCycler::FORWARD : |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
922 //////////////////////////////////////////////////////////////////////////////// | 922 //////////////////////////////////////////////////////////////////////////////// |
923 // Shell, aura::client::ActivationChangeObserver implementation: | 923 // Shell, aura::client::ActivationChangeObserver implementation: |
924 | 924 |
925 void Shell::OnWindowActivated(aura::Window* gained_active, | 925 void Shell::OnWindowActivated(aura::Window* gained_active, |
926 aura::Window* lost_active) { | 926 aura::Window* lost_active) { |
927 if (gained_active) | 927 if (gained_active) |
928 active_root_window_ = gained_active->GetRootWindow(); | 928 active_root_window_ = gained_active->GetRootWindow(); |
929 } | 929 } |
930 | 930 |
931 } // namespace ash | 931 } // namespace ash |
OLD | NEW |