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

Side by Side Diff: ash/shelf/shelf_controller.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « ash/shelf/shelf_controller.h ('k') | ash/shelf/shelf_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/common/shelf/shelf_controller.h" 5 #include "ash/shelf/shelf_controller.h"
6 6
7 #include "ash/common/shelf/shelf_item_delegate.h"
8 #include "ash/common/shelf/wm_shelf.h"
9 #include "ash/common/wm_shell.h"
10 #include "ash/common/wm_window.h"
11 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_item_delegate.h"
9 #include "ash/shelf/wm_shelf.h"
12 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/wm_shell.h"
12 #include "ash/wm_window.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "ui/base/models/simple_menu_model.h" 14 #include "ui/base/models/simple_menu_model.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/display/display.h" 16 #include "ui/display/display.h"
17 #include "ui/display/screen.h" 17 #include "ui/display/screen.h"
18 #include "ui/gfx/image/image_skia.h" 18 #include "ui/gfx/image/image_skia.h"
19 #include "ui/resources/grit/ui_resources.h" 19 #include "ui/resources/grit/ui_resources.h"
20 20
21 namespace ash { 21 namespace ash {
22 22
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 return; 235 return;
236 ShelfID shelf_id = app_id_to_shelf_id_[app_id]; 236 ShelfID shelf_id = app_id_to_shelf_id_[app_id];
237 int index = model_.ItemIndexByID(shelf_id); 237 int index = model_.ItemIndexByID(shelf_id);
238 DCHECK_GE(index, 0); 238 DCHECK_GE(index, 0);
239 ShelfItem item = *model_.ItemByID(shelf_id); 239 ShelfItem item = *model_.ItemByID(shelf_id);
240 item.image = GetShelfIconFromBitmap(image); 240 item.image = GetShelfIconFromBitmap(image);
241 model_.Set(index, item); 241 model_.Set(index, item);
242 } 242 }
243 243
244 } // namespace ash 244 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_controller.h ('k') | ash/shelf/shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698