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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.h

Issue 11092034: Add Wallpaper option to launcher context menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Whitespace, Null Check, Comment Update Created 8 years, 2 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_context_menu.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
7 7
8 #include "ash/launcher/launcher_alignment_menu.h" 8 #include "ash/launcher/launcher_alignment_menu.h"
9 #include "ash/launcher/launcher_types.h" 9 #include "ash/launcher/launcher_types.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 MENU_CLOSE, 44 MENU_CLOSE,
45 MENU_PIN, 45 MENU_PIN,
46 LAUNCH_TYPE_PINNED_TAB, 46 LAUNCH_TYPE_PINNED_TAB,
47 LAUNCH_TYPE_REGULAR_TAB, 47 LAUNCH_TYPE_REGULAR_TAB,
48 LAUNCH_TYPE_FULLSCREEN, 48 LAUNCH_TYPE_FULLSCREEN,
49 LAUNCH_TYPE_WINDOW, 49 LAUNCH_TYPE_WINDOW,
50 MENU_AUTO_HIDE, 50 MENU_AUTO_HIDE,
51 MENU_NEW_WINDOW, 51 MENU_NEW_WINDOW,
52 MENU_NEW_INCOGNITO_WINDOW, 52 MENU_NEW_INCOGNITO_WINDOW,
53 MENU_ALIGNMENT_MENU, 53 MENU_ALIGNMENT_MENU,
54 MENU_CHANGE_WALLPAPER,
54 }; 55 };
55 56
56 // Does |item_| represent a valid item? See description of constructor for 57 // Does |item_| represent a valid item? See description of constructor for
57 // details on why it may not be valid. 58 // details on why it may not be valid.
58 bool is_valid_item() const { return item_.id != 0; } 59 bool is_valid_item() const { return item_.id != 0; }
59 60
60 ChromeLauncherController* controller_; 61 ChromeLauncherController* controller_;
61 62
62 ash::LauncherItem item_; 63 ash::LauncherItem item_;
63 64
64 ash::LauncherAlignmentMenu alignment_menu_; 65 ash::LauncherAlignmentMenu alignment_menu_;
65 66
66 scoped_ptr<extensions::ContextMenuMatcher> extension_items_; 67 scoped_ptr<extensions::ContextMenuMatcher> extension_items_;
67 68
68 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu); 69 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
69 }; 70 };
70 71
71 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 72 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
OLDNEW
« no previous file with comments | « ash/shell_context_menu.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698