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

Side by Side Diff: ash/shell.cc

Issue 9289036: aura: Add Layer::LAYER_SOLID_COLOR to compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor changes Created 8 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 | ash/wm/base_layout_manager_unittest.cc » ('j') | ui/gfx/compositor/layer.cc » ('J')
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 8
9 #include "ash/accelerators/accelerator_controller.h" 9 #include "ash/accelerators/accelerator_controller.h"
10 #include "ash/accelerators/accelerator_filter.h" 10 #include "ash/accelerators/accelerator_filter.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 aura::RootWindow* root_window = aura::RootWindow::GetInstance(); 241 aura::RootWindow* root_window = aura::RootWindow::GetInstance();
242 root_window->SetCursor(aura::kCursorPointer); 242 root_window->SetCursor(aura::kCursorPointer);
243 243
244 activation_controller_.reset(new internal::ActivationController); 244 activation_controller_.reset(new internal::ActivationController);
245 245
246 aura::Window::Windows containers; 246 aura::Window::Windows containers;
247 CreateSpecialContainers(&containers, IsWindowModeCompact()); 247 CreateSpecialContainers(&containers, IsWindowModeCompact());
248 aura::Window::Windows::const_iterator i; 248 aura::Window::Windows::const_iterator i;
249 for (i = containers.begin(); i != containers.end(); ++i) { 249 for (i = containers.begin(); i != containers.end(); ++i) {
250 (*i)->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); 250 (*i)->Init(ui::Layer::LAYER_NOT_DRAWN);
251 root_window->AddChild(*i); 251 root_window->AddChild(*i);
252 if ((*i)->id() != internal::kShellWindowId_UnparentedControlContainer) 252 if ((*i)->id() != internal::kShellWindowId_UnparentedControlContainer)
253 (*i)->Show(); 253 (*i)->Show();
254 } 254 }
255 255
256 stacking_controller_.reset(new internal::StackingController); 256 stacking_controller_.reset(new internal::StackingController);
257 257
258 InitLayoutManagers(root_window); 258 InitLayoutManagers(root_window);
259 259
260 if (!command_line->HasSwitch(switches::kAuraNoShadows)) 260 if (!command_line->HasSwitch(switches::kAuraNoShadows))
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 default_container->SetLayoutManager( 438 default_container->SetLayoutManager(
439 new internal::WorkspaceLayoutManager( 439 new internal::WorkspaceLayoutManager(
440 workspace_controller_->workspace_manager())); 440 workspace_controller_->workspace_manager()));
441 } 441 }
442 442
443 void Shell::ResetLayoutManager(int container_id) { 443 void Shell::ResetLayoutManager(int container_id) {
444 GetContainer(container_id)->SetLayoutManager(NULL); 444 GetContainer(container_id)->SetLayoutManager(NULL);
445 } 445 }
446 446
447 } // namespace ash 447 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/base_layout_manager_unittest.cc » ('j') | ui/gfx/compositor/layer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698