| 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/launcher_application_menu_item_model.h" | 5 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" | 7 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" |
| 8 | 8 |
| 9 LauncherApplicationMenuItemModel::LauncherApplicationMenuItemModel( | 9 LauncherApplicationMenuItemModel::LauncherApplicationMenuItemModel( |
| 10 ChromeLauncherAppMenuItems item_list) | 10 ChromeLauncherAppMenuItems item_list) |
| 11 : ash::LauncherMenuModel(this), | 11 : ash::LauncherMenuModel(this), |
| 12 launcher_items_(item_list.Pass()) { | 12 launcher_items_(item_list.Pass()) { |
| 13 Build(); | 13 Build(); |
| 14 } | 14 } |
| 15 | 15 |
| 16 LauncherApplicationMenuItemModel::~LauncherApplicationMenuItemModel() { | 16 LauncherApplicationMenuItemModel::~LauncherApplicationMenuItemModel() { |
| 17 } | 17 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 SetIcon(GetIndexOfCommandId(i), item->icon()); | 61 SetIcon(GetIndexOfCommandId(i), item->icon()); |
| 62 } | 62 } |
| 63 RemoveTrailingSeparators(); | 63 RemoveTrailingSeparators(); |
| 64 | 64 |
| 65 // Adding final spacing (if the menu is not empty) to conform the menu to our | 65 // Adding final spacing (if the menu is not empty) to conform the menu to our |
| 66 // style. | 66 // style. |
| 67 if (launcher_items_.size()) | 67 if (launcher_items_.size()) |
| 68 AddSeparator(ui::SPACING_SEPARATOR); | 68 AddSeparator(ui::SPACING_SEPARATOR); |
| 69 } | 69 } |
| 70 | 70 |
| OLD | NEW |