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

Side by Side Diff: ash/launcher/launcher_navigator.cc

Issue 12288012: Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing build breakage with clang Created 7 years, 10 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/launcher/launcher_model.cc ('k') | ash/launcher/launcher_types.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 (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/launcher/launcher_navigator.h" 5 #include "ash/launcher/launcher_navigator.h"
6 6
7 #include "ash/launcher/launcher_model.h" 7 #include "ash/launcher/launcher_model.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
11 namespace { 11 namespace {
12 12
13 // Returns true if accelerator processing should skip the launcher item with 13 // Returns true if accelerator processing should skip the launcher item with
14 // the specified type. 14 // the specified type.
15 bool ShouldSkip(ash::LauncherItemType type) { 15 bool ShouldSkip(ash::LauncherItemType type) {
16 return type == ash::TYPE_APP_LIST || 16 return type == ash::TYPE_APP_LIST ||
17 type == ash::TYPE_BROWSER_SHORTCUT || 17 type == ash::TYPE_BROWSER_SHORTCUT ||
18 type == ash::TYPE_APP_SHORTCUT; 18 type == ash::TYPE_APP_SHORTCUT ||
19 type == ash::TYPE_WINDOWED_APP;
19 } 20 }
20 21
21 } // namespace 22 } // namespace
22 23
23 int GetNextActivatedItemIndex(const LauncherModel& model, 24 int GetNextActivatedItemIndex(const LauncherModel& model,
24 CycleDirection direction) { 25 CycleDirection direction) {
25 const ash::LauncherItems& items = model.items(); 26 const ash::LauncherItems& items = model.items();
26 int item_count = model.item_count(); 27 int item_count = model.item_count();
27 int current_index = -1; 28 int current_index = -1;
28 int first_running = -1; 29 int first_running = -1;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 if (item.status == ash::STATUS_ACTIVE) 63 if (item.status == ash::STATUS_ACTIVE)
63 continue; 64 continue;
64 65
65 return i; 66 return i;
66 } 67 }
67 68
68 return -1; 69 return -1;
69 } 70 }
70 71
71 } // namespace ash 72 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_model.cc ('k') | ash/launcher/launcher_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698