| 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_item_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 GetInstalledExtension(app_id_); | 38 GetInstalledExtension(app_id_); |
| 39 return extension ? UTF8ToUTF16(extension->name()) : string16(); | 39 return extension ? UTF8ToUTF16(extension->name()) : string16(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 ash::LauncherItemType LauncherItemController::GetLauncherItemType() const { | 42 ash::LauncherItemType LauncherItemController::GetLauncherItemType() const { |
| 43 switch (type_) { | 43 switch (type_) { |
| 44 case LauncherItemController::TYPE_SHORTCUT: | 44 case LauncherItemController::TYPE_SHORTCUT: |
| 45 case LauncherItemController::TYPE_WINDOWED_APP: | 45 case LauncherItemController::TYPE_WINDOWED_APP: |
| 46 return ash::TYPE_APP_SHORTCUT; | 46 return ash::TYPE_APP_SHORTCUT; |
| 47 case LauncherItemController::TYPE_APP: | 47 case LauncherItemController::TYPE_APP: |
| 48 case LauncherItemController::TYPE_EXTENSION_PANEL: | |
| 49 return ash::TYPE_PLATFORM_APP; | 48 return ash::TYPE_PLATFORM_APP; |
| 50 case LauncherItemController::TYPE_APP_PANEL: | 49 case LauncherItemController::TYPE_APP_PANEL: |
| 51 return ash::TYPE_APP_PANEL; | 50 return ash::TYPE_APP_PANEL; |
| 52 case LauncherItemController::TYPE_TABBED: | 51 case LauncherItemController::TYPE_TABBED: |
| 53 return ash::TYPE_TABBED; | 52 return ash::TYPE_TABBED; |
| 54 } | 53 } |
| 55 NOTREACHED(); | 54 NOTREACHED(); |
| 56 return ash::TYPE_APP_SHORTCUT; | 55 return ash::TYPE_APP_SHORTCUT; |
| 57 } | 56 } |
| OLD | NEW |