Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_item_controller.cc

Issue 11741023: LauncherItemController: Treat TYPE_EXTENSION_PANEL as ash::TYPE_PLATFORM_APP (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit_tests Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 20 matching lines...) Expand all
31 launcher_controller_->profile()->GetExtensionService()-> 31 launcher_controller_->profile()->GetExtensionService()->
32 GetInstalledExtension(app_id_); 32 GetInstalledExtension(app_id_);
33 return extension ? UTF8ToUTF16(extension->name()) : string16(); 33 return extension ? UTF8ToUTF16(extension->name()) : string16();
34 } 34 }
35 35
36 ash::LauncherItemType LauncherItemController::GetLauncherItemType() const { 36 ash::LauncherItemType LauncherItemController::GetLauncherItemType() const {
37 switch (type_) { 37 switch (type_) {
38 case LauncherItemController::TYPE_SHORTCUT: 38 case LauncherItemController::TYPE_SHORTCUT:
39 return ash::TYPE_APP_SHORTCUT; 39 return ash::TYPE_APP_SHORTCUT;
40 case LauncherItemController::TYPE_APP: 40 case LauncherItemController::TYPE_APP:
41 case LauncherItemController::TYPE_EXTENSION_PANEL:
41 return ash::TYPE_PLATFORM_APP; 42 return ash::TYPE_PLATFORM_APP;
42 case LauncherItemController::TYPE_APP_PANEL: 43 case LauncherItemController::TYPE_APP_PANEL:
43 case LauncherItemController::TYPE_EXTENSION_PANEL:
44 return ash::TYPE_APP_PANEL; 44 return ash::TYPE_APP_PANEL;
45 case LauncherItemController::TYPE_TABBED: 45 case LauncherItemController::TYPE_TABBED:
46 return ash::TYPE_TABBED; 46 return ash::TYPE_TABBED;
47 } 47 }
48 NOTREACHED(); 48 NOTREACHED();
49 return ash::TYPE_APP_SHORTCUT; 49 return ash::TYPE_APP_SHORTCUT;
50 } 50 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698