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

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

Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type. (Closed)
Patch Set: Rebase; remove new LauncherItemController::TYPE_APP check. Created 4 years 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
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_item_controller.h ('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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 7 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
8 #include "chrome/common/extensions/extension_constants.h" 8 #include "chrome/common/extensions/extension_constants.h"
9 9
10 LauncherItemController::LauncherItemController( 10 LauncherItemController::LauncherItemController(
11 Type type,
12 const std::string& app_id, 11 const std::string& app_id,
13 const std::string& launch_id, 12 const std::string& launch_id,
14 ChromeLauncherController* launcher_controller) 13 ChromeLauncherController* launcher_controller)
15 : type_(type), 14 : app_id_(app_id),
16 app_id_(app_id),
17 launch_id_(launch_id), 15 launch_id_(launch_id),
18 shelf_id_(0), 16 shelf_id_(0),
19 launcher_controller_(launcher_controller), 17 launcher_controller_(launcher_controller),
20 locked_(0), 18 locked_(0),
21 image_set_by_controller_(false) {} 19 image_set_by_controller_(false) {}
22 20
23 LauncherItemController::~LauncherItemController() {} 21 LauncherItemController::~LauncherItemController() {}
24
25 ash::ShelfItemType LauncherItemController::GetShelfItemType() const {
26 if (extension_misc::IsImeMenuExtensionId(app_id_))
27 return ash::TYPE_IME_MENU;
28
29 switch (type_) {
30 case LauncherItemController::TYPE_SHORTCUT:
31 return ash::TYPE_APP_SHORTCUT;
32 case LauncherItemController::TYPE_APP:
33 return ash::TYPE_APP;
34 case LauncherItemController::TYPE_APP_PANEL:
35 return ash::TYPE_APP_PANEL;
36 }
37 NOTREACHED();
38 return ash::TYPE_APP_SHORTCUT;
39 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_item_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698