| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
| 9 #include "ash/shelf/shelf_button.h" | 9 #include "ash/shelf/shelf_button.h" |
| 10 #include "ash/shelf/shelf_constants.h" | 10 #include "ash/shelf/shelf_constants.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 #include "ui/app_list/app_list_switches.h" | 63 #include "ui/app_list/app_list_switches.h" |
| 64 #include "ui/app_list/views/app_list_item_view.h" | 64 #include "ui/app_list/views/app_list_item_view.h" |
| 65 #include "ui/app_list/views/apps_grid_view.h" | 65 #include "ui/app_list/views/apps_grid_view.h" |
| 66 #include "ui/app_list/views/start_page_view.h" | 66 #include "ui/app_list/views/start_page_view.h" |
| 67 #include "ui/app_list/views/tile_item_view.h" | 67 #include "ui/app_list/views/tile_item_view.h" |
| 68 #include "ui/aura/client/aura_constants.h" | 68 #include "ui/aura/client/aura_constants.h" |
| 69 #include "ui/aura/window.h" | 69 #include "ui/aura/window.h" |
| 70 #include "ui/base/window_open_disposition.h" | 70 #include "ui/base/window_open_disposition.h" |
| 71 #include "ui/events/event.h" | 71 #include "ui/events/event.h" |
| 72 #include "ui/events/test/event_generator.h" | 72 #include "ui/events/test/event_generator.h" |
| 73 #include "ui/gfx/host_desktop_type.h" |
| 73 | 74 |
| 74 using extensions::AppWindow; | 75 using extensions::AppWindow; |
| 75 using extensions::Extension; | 76 using extensions::Extension; |
| 76 using content::WebContents; | 77 using content::WebContents; |
| 77 | 78 |
| 78 namespace { | 79 namespace { |
| 79 | 80 |
| 80 class TestEvent : public ui::Event { | 81 class TestEvent : public ui::Event { |
| 81 public: | 82 public: |
| 82 explicit TestEvent(ui::EventType type) | 83 explicit TestEvent(ui::EventType type) |
| (...skipping 2205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2288 controller_->ActivateApp(bookmark_app->id(), ash::LAUNCH_FROM_APP_LIST, 0); | 2289 controller_->ActivateApp(bookmark_app->id(), ash::LAUNCH_FROM_APP_LIST, 0); |
| 2289 | 2290 |
| 2290 // There should be two new browsers. | 2291 // There should be two new browsers. |
| 2291 EXPECT_EQ(3u, chrome::GetTotalBrowserCountForProfile(browser()->profile())); | 2292 EXPECT_EQ(3u, chrome::GetTotalBrowserCountForProfile(browser()->profile())); |
| 2292 | 2293 |
| 2293 // The apps should now be running, with the last opened app active. | 2294 // The apps should now be running, with the last opened app active. |
| 2294 EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status); | 2295 EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status); |
| 2295 EXPECT_EQ(ash::STATUS_ACTIVE, | 2296 EXPECT_EQ(ash::STATUS_ACTIVE, |
| 2296 model_->ItemByID(bookmark_app_shelf_id)->status); | 2297 model_->ItemByID(bookmark_app_shelf_id)->status); |
| 2297 } | 2298 } |
| OLD | NEW |