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

Side by Side Diff: ash/shell.cc

Issue 11756005: Implement rough new dialog style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 years, 11 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 | ui/native_theme/native_theme_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « no previous file | ui/native_theme/native_theme_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698