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

Side by Side Diff: ash/shell/launcher_delegate_impl.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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 | « ash/shell.cc ('k') | ash/system/audio/tray_volume.cc » ('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 (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 "ash/shell/launcher_delegate_impl.h" 5 #include "ash/shell/launcher_delegate_impl.h"
6 6
7 #include "ash/launcher/launcher_context_menu.h" 7 #include "ash/launcher/launcher_context_menu.h"
8 #include "ash/shell/toplevel_window.h" 8 #include "ash/shell/toplevel_window.h"
9 #include "ash/shell/window_watcher.h" 9 #include "ash/shell/window_watcher.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "grit/ui_resources.h" 11 #include "grit/ash_resources.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace shell { 15 namespace shell {
16 16
17 LauncherDelegateImpl::LauncherDelegateImpl(WindowWatcher* watcher) 17 LauncherDelegateImpl::LauncherDelegateImpl(WindowWatcher* watcher)
18 : watcher_(watcher) { 18 : watcher_(watcher) {
19 } 19 }
20 20
21 LauncherDelegateImpl::~LauncherDelegateImpl() { 21 LauncherDelegateImpl::~LauncherDelegateImpl() {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 ash::LauncherID LauncherDelegateImpl::GetIDByWindow(aura::Window* window) { 60 ash::LauncherID LauncherDelegateImpl::GetIDByWindow(aura::Window* window) {
61 return watcher_->GetIDByWindow(window); 61 return watcher_->GetIDByWindow(window);
62 } 62 }
63 63
64 bool LauncherDelegateImpl::IsDraggable(const ash::LauncherItem& item) { 64 bool LauncherDelegateImpl::IsDraggable(const ash::LauncherItem& item) {
65 return true; 65 return true;
66 } 66 }
67 67
68 } // namespace shell 68 } // namespace shell
69 } // namespace ash 69 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698