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

Unified Diff: chrome/installer/util/shell_util.h

Issue 57173002: Adds the concept of a 'safe mode' hotkey start (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/google_chrome_distribution_dummy.cc ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/shell_util.h
===================================================================
--- chrome/installer/util/shell_util.h (revision 232633)
+++ chrome/installer/util/shell_util.h (working copy)
@@ -78,11 +78,12 @@
PROPERTIES_APP_ID = 1 << 4,
PROPERTIES_SHORTCUT_NAME = 1 << 5,
PROPERTIES_DUAL_MODE = 1 << 6,
+ PROPERTIES_HOTKEY = 1 << 7,
};
explicit ShortcutProperties(ShellChange level_in)
: level(level_in), icon_index(0), dual_mode(false),
- pin_to_taskbar(false), options(0U) {}
+ pin_to_taskbar(false), hotkey(0), options(0U) {}
// Sets the target executable to launch from this shortcut.
// This is mandatory when creating a shortcut.
@@ -150,6 +151,11 @@
pin_to_taskbar = pin_to_taskbar_in;
}
+ void set_hotkey(int hotkey_in) {
+ hotkey = hotkey_in;
+ options |= PROPERTIES_HOTKEY;
+ }
+
bool has_target() const {
return (options & PROPERTIES_TARGET) != 0;
}
@@ -178,6 +184,9 @@
return (options & PROPERTIES_DUAL_MODE) != 0;
}
+ bool has_hotkey() const {
+ return (options & PROPERTIES_HOTKEY) != 0;
+ }
// The level to install this shortcut at (CURRENT_USER for a per-user
// shortcut and SYSTEM_LEVEL for an all-users shortcut).
ShellChange level;
@@ -191,6 +200,7 @@
string16 shortcut_name;
bool dual_mode;
bool pin_to_taskbar;
+ int hotkey;
// Bitfield made of IndividualProperties. Properties set in |options| will
// be used to create/update the shortcut, others will be ignored on update
// and possibly replaced by default values on create (see individual
« no previous file with comments | « chrome/installer/util/google_chrome_distribution_dummy.cc ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698