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/extensions/extension_sorting.h" | 5 #include "chrome/browser/extensions/extension_sorting.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
| 10 #include "base/prefs/pref_service.h" |
10 #include "chrome/browser/extensions/extension_scoped_prefs.h" | 11 #include "chrome/browser/extensions/extension_scoped_prefs.h" |
11 #include "chrome/browser/extensions/extension_service.h" | 12 #include "chrome/browser/extensions/extension_service.h" |
12 #include "chrome/browser/prefs/pref_service.h" | |
13 #include "chrome/common/chrome_notification_types.h" | 13 #include "chrome/common/chrome_notification_types.h" |
14 #include "chrome/common/extensions/extension.h" | 14 #include "chrome/common/extensions/extension.h" |
15 #include "content/public/browser/notification_service.h" | 15 #include "content/public/browser/notification_service.h" |
16 | 16 |
17 #if defined(OS_CHROMEOS) | 17 #if defined(OS_CHROMEOS) |
18 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 18 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
19 #endif | 19 #endif |
20 | 20 |
21 using extensions::ExtensionPrefs; | 21 using extensions::ExtensionPrefs; |
22 | 22 |
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
603 ++app_it; | 603 ++app_it; |
604 | 604 |
605 // If there is no next after the collision, returns the next ordinal. | 605 // If there is no next after the collision, returns the next ordinal. |
606 if (app_it == page.end()) | 606 if (app_it == page.end()) |
607 return app_launch_ordinal.CreateAfter(); | 607 return app_launch_ordinal.CreateAfter(); |
608 | 608 |
609 // Otherwise, returns the ordinal between the collision and the next ordinal. | 609 // Otherwise, returns the ordinal between the collision and the next ordinal. |
610 return app_launch_ordinal.CreateBetween(app_it->first); | 610 return app_launch_ordinal.CreateBetween(app_it->first); |
611 } | 611 } |
612 | 612 |
OLD | NEW |