More installer refactoring in the interest of fixing some bugs and cleaning t...

chrome/installer/util/chrome_browser_operations.h

Index: chrome/installer/util/chrome_browser_operations.h
===================================================================
--- chrome/installer/util/chrome_browser_operations.h	(revision 0)
+++ chrome/installer/util/chrome_browser_operations.h	(revision 0)
@@ -0,0 +1,53 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_INSTALLER_UTIL_CHROME_BROWSER_OPERATIONS_H_
+#define CHROME_INSTALLER_UTIL_CHROME_BROWSER_OPERATIONS_H_
+#pragma once
+
+#include <set>
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "chrome/installer/util/product_operations.h"
+
+namespace installer {
+
+// Operations specific to Chrome; see ProductOperations for general info.
+class ChromeBrowserOperations : public ProductOperations {
+ public:
+  ChromeBrowserOperations() {}
+
+  virtual void ReadOptions(const MasterPreferences& prefs,
+                           std::set<std::wstring>* options) OVERRIDE;

[tommi (sloooow) - chröme, 2011/01/21 21:45:17]

I think the "= 0;" approach is more common. Is chrome moving towards using
OVERRIDE?

[grt (UTC plus 2), 2011/01/24 16:07:02]

"= 0;" makes a method pure-virtual.  "OVERRIDE" is a macro that, where
available, expands to compiler-specific juju that throws an error if a method in
a subclass isn't actually overriding anything (e.g., if someone tweaks the base
interface but forgets to change everyone who inherits from it).  The macro was
discussed on chromium-dev a few weeks ago.  I'm a fan of it since it lets MSVC
catch a fairly common error.  Looks like it does something meaningful for clang,
too.

[tommi (sloooow) - chröme, 2011/01/24 19:39:39]

Thanks for the info!  In that case it does sound valuable.

[grt (UTC plus 2), 2011/01/25 03:09:39]

It's an MS feature originally built for targeting the CLR, but it works for
regular old C++ compilation, too.  See
http://msdn.microsoft.com/en-us/library/4dd87x3d(v=VS.90).aspx for more info.

+
+  virtual void ReadOptions(const CommandLine& uninstall_command,
+                           std::set<std::wstring>* options) OVERRIDE;
+
+  virtual void AddKeyFiles(const std::set<std::wstring>& options,
+                           std::vector<FilePath>* key_files) OVERRIDE;
+
+  virtual void AddComDllList(const std::set<std::wstring>& options,
+                             std::vector<FilePath>* com_dll_list) OVERRIDE;
+
+  virtual void AppendProductFlags(
+      const std::set<std::wstring>& options,
+      CommandLine* uninstall_command) OVERRIDE;
+
+  virtual bool SetChannelFlags(const std::set<std::wstring>& options,
+                               bool set,
+                               ChannelInfo* channel_info) const OVERRIDE;
+
+  virtual bool ShouldCreateUninstallEntry(
+      const std::set<std::wstring>& options) const OVERRIDE;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserOperations);
+};
+
+}  // namespace installer
+
+#endif  // CHROME_INSTALLER_UTIL_CHROME_BROWSER_OPERATIONS_H_
Property changes on: chrome\installer\util\chrome_browser_operations.h
___________________________________________________________________
Added: svn:eol-style
   + LF