diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 13:07:19 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 13:07:19 +0000 |
| commit | b913a3acaaebf26e54ca13dc37e3c21527e841f3 (patch) | |
| tree | deeb025f24a5709d9272e3da45b558f27cb4eb2d /ash/shell | |
| parent | ff1779bcb9314565caab15f8bfb44e57d9744b33 (diff) | |
| download | chromium_src-b913a3acaaebf26e54ca13dc37e3c21527e841f3.zip chromium_src-b913a3acaaebf26e54ca13dc37e3c21527e841f3.tar.gz chromium_src-b913a3acaaebf26e54ca13dc37e3c21527e841f3.tar.bz2 | |
- Show app list on 2nd launcher
- Share the launcher mode/delegate in multiple launchers.
This CL moves the launcher mode/delegate to Shell
- Initialize Display objects before creating RootWindow
for 2nd as it'll be used during creation.
I'll add tests in next CL, as it crashes without https://codereview.chromium.org/11515004/.
BUG=145978
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11465037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/app_list.cc | 2 | ||||
| -rw-r--r-- | ash/shell/window_watcher.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index 0e7e103e..268a472 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -275,7 +275,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { virtual void Dismiss() OVERRIDE { DCHECK(ash::Shell::HasInstance()); if (Shell::GetInstance()->GetAppListTargetVisibility()) - Shell::GetInstance()->ToggleAppList(); + Shell::GetInstance()->ToggleAppList(NULL); } virtual void ViewClosing() OVERRIDE { diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index 157a598..9f30bff 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -77,7 +77,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) { return; static int image_count = 0; - ash::LauncherModel* model = Launcher::ForPrimaryDisplay()->model(); + ash::LauncherModel* model = Shell::GetInstance()->launcher_model(); ash::LauncherItem item; item.type = ash::TYPE_TABBED; id_to_window_[model->next_id()] = new_window; @@ -100,7 +100,7 @@ void WindowWatcher::OnWillRemoveWindow(aura::Window* window) { for (IDToWindow::iterator i = id_to_window_.begin(); i != id_to_window_.end(); ++i) { if (i->second == window) { - ash::LauncherModel* model = Launcher::ForPrimaryDisplay()->model(); + ash::LauncherModel* model = Shell::GetInstance()->launcher_model(); int index = model->ItemIndexByID(i->first); DCHECK_NE(-1, index); model->RemoveItemAt(index); |