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_impl.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 3120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3131 app_panel_controller2, app_id, ash::STATUS_RUNNING); | 3131 app_panel_controller2, app_id, ash::STATUS_RUNNING); |
3132 EXPECT_EQ(panel_index, model_observer_->last_index()); | 3132 EXPECT_EQ(panel_index, model_observer_->last_index()); |
3133 EXPECT_EQ(1, model_observer_->added()); | 3133 EXPECT_EQ(1, model_observer_->added()); |
3134 model_observer_->clear_counts(); | 3134 model_observer_->clear_counts(); |
3135 | 3135 |
3136 launcher_controller_->CloseLauncherItem(shelf_id2); | 3136 launcher_controller_->CloseLauncherItem(shelf_id2); |
3137 launcher_controller_->CloseLauncherItem(shelf_id1); | 3137 launcher_controller_->CloseLauncherItem(shelf_id1); |
3138 EXPECT_EQ(2, model_observer_->removed()); | 3138 EXPECT_EQ(2, model_observer_->removed()); |
3139 } | 3139 } |
3140 | 3140 |
3141 // Tests that the Gmail extension matches more then the app itself claims with | 3141 // Tests that the Gmail extension matches more than the app itself claims with |
3142 // the manifest file. | 3142 // the manifest file. |
3143 TEST_F(ChromeLauncherControllerImplTest, GmailMatching) { | 3143 TEST_F(ChromeLauncherControllerImplTest, GmailMatching) { |
3144 InitLauncherControllerWithBrowser(); | 3144 InitLauncherControllerWithBrowser(); |
3145 | 3145 |
3146 // Create a Gmail browser tab. | 3146 // Create a Gmail browser tab. |
3147 chrome::NewTab(browser()); | 3147 chrome::NewTab(browser()); |
3148 base::string16 title = ASCIIToUTF16("Test"); | 3148 base::string16 title = ASCIIToUTF16("Test"); |
3149 NavigateAndCommitActiveTabWithTitle(browser(), GURL(gmail_url), title); | 3149 NavigateAndCommitActiveTabWithTitle(browser(), GURL(gmail_url), title); |
3150 content::WebContents* content = | 3150 content::WebContents* content = |
3151 browser()->tab_strip_model()->GetActiveWebContents(); | 3151 browser()->tab_strip_model()->GetActiveWebContents(); |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3698 EXPECT_FALSE(controller->rotation_locked()); | 3698 EXPECT_FALSE(controller->rotation_locked()); |
3699 EXPECT_EQ(display::Display::ROTATE_0, | 3699 EXPECT_EQ(display::Display::ROTATE_0, |
3700 display::Screen::GetScreen()->GetPrimaryDisplay().rotation()); | 3700 display::Screen::GetScreen()->GetPrimaryDisplay().rotation()); |
3701 | 3701 |
3702 NotifyOnTaskOrientationLockRequested(task_id_current_, | 3702 NotifyOnTaskOrientationLockRequested(task_id_current_, |
3703 OrientationLock::CURRENT); | 3703 OrientationLock::CURRENT); |
3704 EXPECT_TRUE(controller->rotation_locked()); | 3704 EXPECT_TRUE(controller->rotation_locked()); |
3705 EXPECT_EQ(display::Display::ROTATE_0, | 3705 EXPECT_EQ(display::Display::ROTATE_0, |
3706 display::Screen::GetScreen()->GetPrimaryDisplay().rotation()); | 3706 display::Screen::GetScreen()->GetPrimaryDisplay().rotation()); |
3707 } | 3707 } |
OLD | NEW |