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

Side by Side Diff: ash/shell.h

Issue 13993027: ash: Update app list button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 #endif // defined(OS_CHROMEOS) 437 #endif // defined(OS_CHROMEOS)
438 438
439 RootWindowHostFactory* root_window_host_factory() { 439 RootWindowHostFactory* root_window_host_factory() {
440 return root_window_host_factory_.get(); 440 return root_window_host_factory_.get();
441 } 441 }
442 442
443 LauncherModel* launcher_model() { 443 LauncherModel* launcher_model() {
444 return launcher_model_.get(); 444 return launcher_model_.get();
445 } 445 }
446 446
447 internal::AppListController* app_list_controller() {
448 return app_list_controller_.get();
449 }
450
447 // Returns the launcher delegate, creating if necesary. 451 // Returns the launcher delegate, creating if necesary.
448 LauncherDelegate* GetLauncherDelegate(); 452 LauncherDelegate* GetLauncherDelegate();
449 453
450 private: 454 private:
451 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 455 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
452 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 456 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
453 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 457 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
454 friend class internal::RootWindowController; 458 friend class internal::RootWindowController;
455 friend class test::ShellTestApi; 459 friend class test::ShellTestApi;
456 friend class shell::WindowWatcher; 460 friend class shell::WindowWatcher;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 591
588 // For testing only: simulate that a modal window is open 592 // For testing only: simulate that a modal window is open
589 bool simulate_modal_window_open_for_testing_; 593 bool simulate_modal_window_open_for_testing_;
590 594
591 DISALLOW_COPY_AND_ASSIGN(Shell); 595 DISALLOW_COPY_AND_ASSIGN(Shell);
592 }; 596 };
593 597
594 } // namespace ash 598 } // namespace ash
595 599
596 #endif // ASH_SHELL_H_ 600 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698