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

Side by Side Diff: ash/shell.cc

Issue 10533041: Remove root window from screen_ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | « ash/screen_ash.cc ('k') | no next file » | 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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 556
557 internal::WorkspaceController* Shell::TestApi::workspace_controller() { 557 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
558 return shell_->workspace_controller_.get(); 558 return shell_->workspace_controller_.get();
559 } 559 }
560 560
561 //////////////////////////////////////////////////////////////////////////////// 561 ////////////////////////////////////////////////////////////////////////////////
562 // Shell, public: 562 // Shell, public:
563 563
564 Shell::Shell(ShellDelegate* delegate) 564 Shell::Shell(ShellDelegate* delegate)
565 : root_window_(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()), 565 : root_window_(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()),
566 screen_(new ScreenAsh(root_window_.get())), 566 screen_(new ScreenAsh),
567 env_filter_(NULL), 567 env_filter_(NULL),
568 delegate_(delegate), 568 delegate_(delegate),
569 #if defined(OS_CHROMEOS) 569 #if defined(OS_CHROMEOS)
570 output_configurator_(new chromeos::OutputConfigurator()), 570 output_configurator_(new chromeos::OutputConfigurator()),
571 #endif // defined(OS_CHROMEOS) 571 #endif // defined(OS_CHROMEOS)
572 shelf_(NULL), 572 shelf_(NULL),
573 panel_layout_manager_(NULL), 573 panel_layout_manager_(NULL),
574 root_window_layout_(NULL), 574 root_window_layout_(NULL),
575 status_area_widget_(NULL), 575 status_area_widget_(NULL),
576 browser_context_(NULL) { 576 browser_context_(NULL) {
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 void Shell::SetCursor(gfx::NativeCursor cursor) { 1079 void Shell::SetCursor(gfx::NativeCursor cursor) {
1080 // TODO(oshima): set cursor to all root windows. 1080 // TODO(oshima): set cursor to all root windows.
1081 GetPrimaryRootWindow()->SetCursor(cursor); 1081 GetPrimaryRootWindow()->SetCursor(cursor);
1082 } 1082 }
1083 1083
1084 void Shell::ShowCursor(bool visible) { 1084 void Shell::ShowCursor(bool visible) {
1085 GetPrimaryRootWindow()->ShowCursor(visible); 1085 GetPrimaryRootWindow()->ShowCursor(visible);
1086 } 1086 }
1087 1087
1088 } // namespace ash 1088 } // namespace ash
OLDNEW
« no previous file with comments | « ash/screen_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698