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

Side by Side Diff: ash/shell.h

Issue 10910164: Removes the grid from ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ShelfBrowserTest Created 8 years, 3 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/accelerators/accelerator_controller.cc ('k') | ash/shell.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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 internal::ShelfLayoutManager* shelf() const { return shelf_; } 321 internal::ShelfLayoutManager* shelf() const { return shelf_; }
322 322
323 internal::StatusAreaWidget* status_area_widget() const { 323 internal::StatusAreaWidget* status_area_widget() const {
324 return status_area_widget_; 324 return status_area_widget_;
325 } 325 }
326 326
327 // Convenience accessor for members of StatusAreaWidget. 327 // Convenience accessor for members of StatusAreaWidget.
328 SystemTrayDelegate* tray_delegate(); 328 SystemTrayDelegate* tray_delegate();
329 SystemTray* system_tray(); 329 SystemTray* system_tray();
330 330
331 // Returns the size of the grid.
332 int GetGridSize() const;
333
334 static void set_initially_hide_cursor(bool hide) { 331 static void set_initially_hide_cursor(bool hide) {
335 initially_hide_cursor_ = hide; 332 initially_hide_cursor_ = hide;
336 } 333 }
337 334
338 internal::ResizeShadowController* resize_shadow_controller() { 335 internal::ResizeShadowController* resize_shadow_controller() {
339 return resize_shadow_controller_.get(); 336 return resize_shadow_controller_.get();
340 } 337 }
341 338
342 // Made available for tests. 339 // Made available for tests.
343 internal::ShadowController* shadow_controller() { 340 internal::ShadowController* shadow_controller() {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 373
377 // Initializes the root window and root window controller so that it 374 // Initializes the root window and root window controller so that it
378 // can host browser windows. 375 // can host browser windows.
379 void InitRootWindowController(internal::RootWindowController* root); 376 void InitRootWindowController(internal::RootWindowController* root);
380 377
381 // Initializes the layout managers and event filters specific for 378 // Initializes the layout managers and event filters specific for
382 // primary display. 379 // primary display.
383 void InitLayoutManagersForPrimaryDisplay( 380 void InitLayoutManagersForPrimaryDisplay(
384 internal::RootWindowController* root_window_controller); 381 internal::RootWindowController* root_window_controller);
385 382
386 // Disables the workspace grid layout.
387 void DisableWorkspaceGridLayout();
388
389 // aura::CursorManager::Delegate overrides: 383 // aura::CursorManager::Delegate overrides:
390 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; 384 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
391 virtual void ShowCursor(bool visible) OVERRIDE; 385 virtual void ShowCursor(bool visible) OVERRIDE;
392 386
393 static Shell* instance_; 387 static Shell* instance_;
394 388
395 // If set before the Shell is initialized, the mouse cursor will be hidden 389 // If set before the Shell is initialized, the mouse cursor will be hidden
396 // when the screen is initially created. 390 // when the screen is initially created.
397 static bool initially_hide_cursor_; 391 static bool initially_hide_cursor_;
398 392
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 484
491 // Used by ash/shell. 485 // Used by ash/shell.
492 content::BrowserContext* browser_context_; 486 content::BrowserContext* browser_context_;
493 487
494 DISALLOW_COPY_AND_ASSIGN(Shell); 488 DISALLOW_COPY_AND_ASSIGN(Shell);
495 }; 489 };
496 490
497 } // namespace ash 491 } // namespace ash
498 492
499 #endif // ASH_SHELL_H_ 493 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698