win8/delegate_execute/command_execute_impl.h - Issue 23258005: Give SxS distribution its own registration GUIDs.

Unified Diff: win8/delegate_execute/command_execute_impl.h

Issue 23258005: Give SxS distribution its own registration GUIDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove the word 'we' from comment. Created 7 years, 4 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:

Index: win8/delegate_execute/command_execute_impl.h

diff --git a/win8/delegate_execute/command_execute_impl.h b/win8/delegate_execute/command_execute_impl.h

index 313f2dd1e0113c15ce11e8925e51de501d9b5d79..bfd148e42fe93a5dea9ed106c9ba9db7b3f645ec 100644

--- a/win8/delegate_execute/command_execute_impl.h

+++ b/win8/delegate_execute/command_execute_impl.h

@@ -23,13 +23,12 @@ EXTERN_C const GUID CLSID_CommandExecuteImpl;

// This class implements the IExecuteCommand and related interfaces for

// handling ShellExecute launches of the Chrome browser, i.e. whether to

// launch Chrome in metro mode or desktop mode.

-#if defined(GOOGLE_CHROME_BUILD)

-class ATL_NO_VTABLE DECLSPEC_UUID("5C65F4B0-3651-4514-B207-D10CB699B14B")

+// The CLSID here is a dummy CLSID not used for anything, since we register

+// the class with a dynamic CLSID. However, a static CLSID is necessary

+// so that we can force at least one entry into ATL's object map (it will

+// treat a 0-element object map as an initialization failure case).

+class ATL_NO_VTABLE DECLSPEC_UUID("071BB5F2-85A4-424F-BFE7-5F1609BE4C2C")

CommandExecuteImpl

-#else // GOOGLE_CHROME_BUILD

-class ATL_NO_VTABLE DECLSPEC_UUID("A2DF06F9-A21A-44A8-8A99-8B9C84F29160")

- CommandExecuteImpl

-#endif // GOOGLE_CHROME_BUILD

: public CComObjectRootEx<CComSingleThreadModel>,

public CComCoClass<CommandExecuteImpl, &CLSID_CommandExecuteImpl>,

public IExecuteCommand,

@@ -106,4 +105,4 @@ class ATL_NO_VTABLE DECLSPEC_UUID("A2DF06F9-A21A-44A8-8A99-8B9C84F29160")

EC_HOST_UI_MODE chrome_mode_;

};

-OBJECT_ENTRY_AUTO(__uuidof(CommandExecuteImpl), CommandExecuteImpl)

+OBJECT_ENTRY_AUTO(__uuidof(CommandExecuteImpl), CommandExecuteImpl)

grt (UTC plus 2) 2013/08/30 03:28:18 just curious: what's up with the whitespace change

grt (UTC plus 2) 2013/09/04 03:33:36 ping?

zturner 2013/09/05 01:35:29 Fixed this, the newline was there, I had unintenti