diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 13:52:48 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 13:52:48 +0000 |
| commit | c25ff508f15b636ba2e52da37fe0af75c4f56092 (patch) | |
| tree | 127385d0f2c57f85b2b247b900061866d7f597c8 /ash/shell.cc | |
| parent | 177b434c09af53793b2ca76e48ee62af2a71f4b6 (diff) | |
| download | chromium_src-c25ff508f15b636ba2e52da37fe0af75c4f56092.zip chromium_src-c25ff508f15b636ba2e52da37fe0af75c4f56092.tar.gz chromium_src-c25ff508f15b636ba2e52da37fe0af75c4f56092.tar.bz2 | |
ash: Rename more Launcher classes to Shelf*.
* Rename LauncherItemDelegate to ShelfItemDelegate.
* Move launcher_item_delegate.h from launcher/ to shelf/
* Rename to shelf_item_delegate.h
* Rename TestLauncherItemDelegate to TestShelfItemDelegate.
* Move test_launcher_item_delegate.* from launcher/ to shelf/
* Rename to test_shelf_item_delegate.*
* Rename LauncherItemDelegateManager to ShelfItemDelegateManager.
* Move launcher_item_delegate_manager.* from launcher/ to shelf/
* Rename to shelf_item_delegate_manager.*
* Rename LauncherItemDelegateManagerTestAPI to ShelfItemDelegateManagerTestAPI.
* Move launcher_item_delegate_manager_test_api.* from launcher/ to shelf/
* Rename to shelf_item_delegate_manager_test_api.*
* Rename WindowWatcherLauncherItemDelegate to WindowWatcherShelfItemDelegate.
* Move window_watcher_launcher_item_delegate.* from launcher/ to shelf/
* Rename to window_watcher_shelf_item_delegate.*
* Rename LauncherMenuModel to ShelfMenuModel.
* Host it into its own header file named shelf_menu_model.h
BUG=248353
TEST=None, no functional changes
R=jamescook@chromium.org,harrym@chromium.org
Review URL: https://codereview.chromium.org/97173003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 6fb3df9..847d562 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -31,8 +31,6 @@ #include "ash/host/root_window_host_factory.h" #include "ash/keyboard_uma_event_filter.h" #include "ash/launcher/launcher_delegate.h" -#include "ash/launcher/launcher_item_delegate.h" -#include "ash/launcher/launcher_item_delegate_manager.h" #include "ash/magnifier/magnification_controller.h" #include "ash/magnifier/partial_magnification_controller.h" #include "ash/media_delegate.h" @@ -41,6 +39,8 @@ #include "ash/screen_ash.h" #include "ash/session_state_delegate.h" #include "ash/shelf/app_list_shelf_item_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_delegate_manager.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/shelf_widget.h" @@ -500,24 +500,23 @@ SystemTray* Shell::GetPrimarySystemTray() { LauncherDelegate* Shell::GetLauncherDelegate() { if (!launcher_delegate_) { shelf_model_.reset(new ShelfModel); - // Creates LauncherItemDelegateManager before LauncherDelegate. - launcher_item_delegate_manager_.reset( - new LauncherItemDelegateManager(shelf_model_.get())); + // Creates ShelfItemDelegateManager before LauncherDelegate. + shelf_item_delegate_manager_.reset( + new ShelfItemDelegateManager(shelf_model_.get())); launcher_delegate_.reset( delegate_->CreateLauncherDelegate(shelf_model_.get())); - scoped_ptr<LauncherItemDelegate> controller( + scoped_ptr<ShelfItemDelegate> controller( new internal::AppListShelfItemDelegate); // Finding the shelf model's location of the app list and setting its - // LauncherItemDelegate. + // ShelfItemDelegate. int app_list_index = shelf_model_->GetItemIndexForType(TYPE_APP_LIST); DCHECK_GE(app_list_index, 0); LauncherID app_list_id = shelf_model_->items()[app_list_index].id; DCHECK(app_list_id); - launcher_item_delegate_manager_->SetLauncherItemDelegate( - app_list_id, - controller.Pass()); + shelf_item_delegate_manager_->SetShelfItemDelegate(app_list_id, + controller.Pass()); } return launcher_delegate_.get(); } @@ -657,9 +656,9 @@ Shell::~Shell() { user_action_client_.reset(); visibility_controller_.reset(); launcher_delegate_.reset(); - // |launcher_item_delegate_manager_| observes |shelf_model_|. It must be + // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be // destroyed before |shelf_model_| is destroyed. - launcher_item_delegate_manager_.reset(); + shelf_item_delegate_manager_.reset(); shelf_model_.reset(); video_detector_.reset(); |