summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 21:08:27 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 21:08:27 +0000
commit104ff43eb01ac9b0e50b25aace950dd75af77c8b (patch)
tree8acf95b961572d82e36e2f26550d24c2781d6d89
parentb297c5de56e19726064c128574d69fffbd465a18 (diff)
downloadchromium_src-104ff43eb01ac9b0e50b25aace950dd75af77c8b.zip
chromium_src-104ff43eb01ac9b0e50b25aace950dd75af77c8b.tar.gz
chromium_src-104ff43eb01ac9b0e50b25aace950dd75af77c8b.tar.bz2
Coverity: Add a SavePackageType, SAVE_TYPE_UNKNOWN, which represents the state of the save type before the user has selected a save type. Initialize save_type_ to this value in the constructor.
CID=3809 BUG=none TEST=none Review URL: http://codereview.chromium.org/220016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26983 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/download/save_package.cc4
-rw-r--r--chrome/browser/download/save_package.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 10def30..701c3bf 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -54,7 +54,7 @@ struct SavePackageParam {
// Directory path for saving sub resources and sub html frames.
FilePath dir;
- SavePackageParam(const std::string& mime_type)
+ explicit SavePackageParam(const std::string& mime_type)
: current_tab_mime_type(mime_type) { }
};
@@ -151,6 +151,7 @@ SavePackage::SavePackage(TabContents* tab_contents)
finished_(false),
user_canceled_(false),
disk_error_occurred_(false),
+ save_type_(SAVE_TYPE_UNKNOWN),
all_save_items_count_(0),
wait_state_(INITIALIZE),
tab_id_(tab_contents->process()->id()) {
@@ -170,6 +171,7 @@ SavePackage::SavePackage(const FilePath& file_full_path,
finished_(true),
user_canceled_(false),
disk_error_occurred_(false),
+ save_type_(SAVE_TYPE_UNKNOWN),
all_save_items_count_(0),
tab_id_(0) {
DCHECK(!saved_main_file_path_.empty() &&
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index c448bef..224cee2 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -55,6 +55,8 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage>,
public SelectFileDialog::Listener {
public:
enum SavePackageType {
+ // The value of the save type before its set by the user.
+ SAVE_TYPE_UNKNOWN = -1,
// User chose to save only the HTML of the page.
SAVE_AS_ONLY_HTML = 0,
// User chose to save complete-html page.
@@ -81,7 +83,7 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage>,
// Constructor for user initiated page saving. This constructor results in a
// SavePackage that will generate and sanitize a suggested name for the user
// in the "Save As" dialog box.
- SavePackage(TabContents* web_content);
+ explicit SavePackage(TabContents* web_content);
// This contructor is used only for testing. We can bypass the file and
// directory name generation / sanitization by providing well known paths