OLD | NEW |
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 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.
h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.
h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 ChromeLauncherControllerPerBrowser::IDToItemControllerMap::const_iterator | 105 ChromeLauncherControllerPerBrowser::IDToItemControllerMap::const_iterator |
106 entry(controller->id_to_item_controller_map_.find(iter->id)); | 106 entry(controller->id_to_item_controller_map_.find(iter->id)); |
107 if (iter->type == ash::TYPE_APP_SHORTCUT && | 107 if (iter->type == ash::TYPE_APP_SHORTCUT && |
108 entry != controller->id_to_item_controller_map_.end()) { | 108 entry != controller->id_to_item_controller_map_.end()) { |
109 launchers->push_back(entry->second->app_id()); | 109 launchers->push_back(entry->second->app_id()); |
110 } | 110 } |
111 } | 111 } |
112 } | 112 } |
113 | 113 |
114 // Needed for extension service & friends to work. | 114 // Needed for extension service & friends to work. |
115 MessageLoop loop_; | 115 base::MessageLoop loop_; |
116 content::TestBrowserThread ui_thread_; | 116 content::TestBrowserThread ui_thread_; |
117 content::TestBrowserThread file_thread_; | 117 content::TestBrowserThread file_thread_; |
118 | 118 |
119 #if defined OS_CHROMEOS | 119 #if defined OS_CHROMEOS |
120 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; | 120 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; |
121 chromeos::ScopedTestCrosSettings test_cros_settings_; | 121 chromeos::ScopedTestCrosSettings test_cros_settings_; |
122 chromeos::ScopedTestUserManager test_user_manager_; | 122 chromeos::ScopedTestUserManager test_user_manager_; |
123 #endif | 123 #endif |
124 | 124 |
125 scoped_refptr<Extension> extension1_; | 125 scoped_refptr<Extension> extension1_; |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 | 288 |
289 GetAppLaunchers(&controller, &actual_launchers); | 289 GetAppLaunchers(&controller, &actual_launchers); |
290 EXPECT_EQ(expected_launchers, actual_launchers); | 290 EXPECT_EQ(expected_launchers, actual_launchers); |
291 | 291 |
292 // Install |extension2| and verify it shows up between the other two. | 292 // Install |extension2| and verify it shows up between the other two. |
293 extension_service_->AddExtension(extension2_.get()); | 293 extension_service_->AddExtension(extension2_.get()); |
294 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id()); | 294 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id()); |
295 GetAppLaunchers(&controller, &actual_launchers); | 295 GetAppLaunchers(&controller, &actual_launchers); |
296 EXPECT_EQ(expected_launchers, actual_launchers); | 296 EXPECT_EQ(expected_launchers, actual_launchers); |
297 } | 297 } |
OLD | NEW |