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

Side by Side Diff: chrome/browser/ui/ash/ash_init.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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
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 "chrome/browser/ui/ash/ash_init.h" 5 #include "chrome/browser/ui/ash/ash_init.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/high_contrast/high_contrast_controller.h" 9 #include "ash/high_contrast/high_contrast_controller.h"
10 #include "ash/magnifier/magnification_controller.h" 10 #include "ash/magnifier/magnification_controller.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 ash::Shell::GetInstance()->magnification_controller()-> 76 ash::Shell::GetInstance()->magnification_controller()->
77 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL); 77 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL);
78 ash::Shell::GetInstance()->partial_magnification_controller()-> 78 ash::Shell::GetInstance()->partial_magnification_controller()->
79 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); 79 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
80 80
81 if (!CommandLine::ForCurrentProcess()->HasSwitch( 81 if (!CommandLine::ForCurrentProcess()->HasSwitch(
82 switches::kDisableZeroBrowsersOpenForTests)) { 82 switches::kDisableZeroBrowsersOpenForTests)) {
83 chrome::StartKeepAlive(); 83 chrome::StartKeepAlive();
84 } 84 }
85 #endif 85 #endif
86 ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->ShowRootWindow(); 86 ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->Show();
87 } 87 }
88 88
89 void CloseAsh() { 89 void CloseAsh() {
90 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't 90 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't
91 // try to cleanup resources. 91 // try to cleanup resources.
92 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() && 92 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&
93 ash::Shell::HasInstance()) { 93 ash::Shell::HasInstance()) {
94 ash::Shell::DeleteInstance(); 94 ash::Shell::DeleteInstance();
95 } 95 }
96 } 96 }
97 97
98 } // namespace chrome 98 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc ('k') | chrome/browser/ui/aura/active_desktop_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698