diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /chrome/installer/util | |
parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
-rw-r--r-- | chrome/installer/util/copy_tree_work_item.cc | 2 | ||||
-rw-r--r-- | chrome/installer/util/html_dialog.h | 4 | ||||
-rw-r--r-- | chrome/installer/util/html_dialog_impl.cc | 6 | ||||
-rwxr-xr-x | chrome/installer/util/prebuild/create_string_rc.py | 4 | ||||
-rw-r--r-- | chrome/installer/util/util_constants.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/chrome/installer/util/copy_tree_work_item.cc b/chrome/installer/util/copy_tree_work_item.cc index fc1d5e3..0b51f95 100644 --- a/chrome/installer/util/copy_tree_work_item.cc +++ b/chrome/installer/util/copy_tree_work_item.cc @@ -68,7 +68,7 @@ bool CopyTreeWorkItem::Do() { (overwrite_option_ == WorkItem::IF_NOT_PRESENT)) { // handle overwrite_option_ = IF_NOT_PRESENT case. return true; - } + } // In all cases that reach here, move dest to a backup path. if (dest_exist) { diff --git a/chrome/installer/util/html_dialog.h b/chrome/installer/util/html_dialog.h index 39b741d..46ed1c8 100644 --- a/chrome/installer/util/html_dialog.h +++ b/chrome/installer/util/html_dialog.h @@ -16,7 +16,7 @@ namespace installer { -// Interface for implementing a native HTML dialog. +// Interface for implementing a native HTML dialog. class HTMLDialog { public: enum DialogResult { @@ -44,7 +44,7 @@ class HTMLDialog { // in HTML so each native implementation needs to map the user action into // one of the 6 possible results of DialogResult. Important, call this // method only from the main (or UI) thread. - virtual DialogResult ShowModal(void* parent_window, + virtual DialogResult ShowModal(void* parent_window, CustomizationCallback* callback) = 0; // If the result of ShowModal() was EXTRA, the information is available diff --git a/chrome/installer/util/html_dialog_impl.cc b/chrome/installer/util/html_dialog_impl.cc index a758d42..8925016 100644 --- a/chrome/installer/util/html_dialog_impl.cc +++ b/chrome/installer/util/html_dialog_impl.cc @@ -32,7 +32,7 @@ namespace installer { // <input name="accept" type="checkbox" /> My cool option // <input name="submit" type="submit" value="[accept]" /> // </form> -// +// // function submit_it(f) { // if (f.accept.checked) { // window.returnValue = 1; <-- this matches HTML_DLG_ACCEPT @@ -85,7 +85,7 @@ HTMLDialogWin::CustomizationCallback* HTMLDialogWin::callback_ = NULL; // This hook function gets called for messages bound to the windows that // ShowHTMLDialog creates. We tell apart the top window because it has the -// system menu style. +// system menu style. LRESULT HTMLDialogWin::MsgFilter(int code, WPARAM wParam, LPARAM lParam) { static bool tweak_window = true; if (lParam && tweak_window) { @@ -113,7 +113,7 @@ bool HTMLDialogWin::InternalDoDialog(CustomizationCallback* callback, IMoniker *url_moniker = NULL; ::CreateURLMoniker(NULL, url_.c_str(), &url_moniker); - if (!url_moniker) + if (!url_moniker) return false; wchar_t* extra_args = NULL; diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py index bb4e5a0..2c53380 100755 --- a/chrome/installer/util/prebuild/create_string_rc.py +++ b/chrome/installer/util/prebuild/create_string_rc.py @@ -150,7 +150,7 @@ def WriteHeaderFile(translated_strings, out_filename): """Writes a .h file with resource ids. This file can be included by the executable to refer to identifiers.""" lines = [] - + # Write the values for how the languages ids are offset. seen_languages = set() offset_id = 0 @@ -180,7 +180,7 @@ def WriteHeaderFile(translated_strings, out_filename): outfile.write('\n'.join(lines)) outfile.write('\n') # .rc files must end in a new line outfile.close() - + def main(argv): translated_strings = CollectTranslatedStrings() kFilebase = os.path.join(argv[1], 'installer_util_strings') diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h index 246a50f..b9d7275 100644 --- a/chrome/installer/util/util_constants.h +++ b/chrome/installer/util/util_constants.h @@ -16,8 +16,8 @@ enum InstallStatus { INSTALL_REPAIRED, // Same version reinstalled for repair NEW_VERSION_UPDATED, // Chrome successfully updated to new version HIGHER_VERSION_EXISTS, // Higher version of Chrome already exists - USER_LEVEL_INSTALL_EXISTS, // User level install already exists - SYSTEM_LEVEL_INSTALL_EXISTS, // Machine level install already exists + USER_LEVEL_INSTALL_EXISTS, // User level install already exists + SYSTEM_LEVEL_INSTALL_EXISTS, // Machine level install already exists INSTALL_FAILED, // Install/update failed OS_NOT_SUPPORTED, // Current OS not supported OS_ERROR, // OS API call failed |