projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
ui
/
ash
/
launcher
/
launcher_item_controller.cc
diff --git
a/src/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
b/src/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
index
41c5c68
..
532552d
100644
(file)
--- a/
src/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
+++ b/
src/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
@@
-17,7
+17,7
@@
LauncherItemController::LauncherItemController(
ChromeLauncherController* launcher_controller)
: type_(type),
app_id_(app_id),
-
launcher
_id_(0),
+
shelf
_id_(0),
launcher_controller_(launcher_controller),
locked_(0),
image_set_by_controller_(false) {