| Index: ui/base/win/shell.h
|
| diff --git a/ui/base/win/shell.h b/ui/base/win/shell.h
|
| index 82f828fe300461b948ae1d2bd025f74436b2f048..e732abf8c54f17f08c5b97eed204c114ba0ff26b 100644
|
| --- a/ui/base/win/shell.h
|
| +++ b/ui/base/win/shell.h
|
| @@ -8,7 +8,7 @@
|
| #include <windows.h>
|
|
|
| #include "base/strings/string16.h"
|
| -#include "ui/base/ui_export.h"
|
| +#include "ui/base/ui_base_export.h"
|
|
|
| namespace base {
|
| class FilePath;
|
| @@ -21,21 +21,22 @@ namespace win {
|
| // default application registered for the file specified by 'full_path',
|
| // ask the user, via the Windows "Open With" dialog.
|
| // Returns 'true' on successful open, 'false' otherwise.
|
| -UI_EXPORT bool OpenItemViaShell(const base::FilePath& full_path);
|
| +UI_BASE_EXPORT bool OpenItemViaShell(const base::FilePath& full_path);
|
|
|
| // The download manager now writes the alternate data stream with the
|
| // zone on all downloads. This function is equivalent to OpenItemViaShell
|
| // without showing the zone warning dialog.
|
| -UI_EXPORT bool OpenItemViaShellNoZoneCheck(const base::FilePath& full_path);
|
| +UI_BASE_EXPORT bool OpenItemViaShellNoZoneCheck(
|
| + const base::FilePath& full_path);
|
|
|
| // Lower level function that allows opening of non-files like urls or GUIDs
|
| // don't use it if one of the above will do. |mask| is a valid combination
|
| // of SEE_MASK_FLAG_XXX as stated in msdn. If there is no default application
|
| // registered for the item, it behaves the same as OpenItemViaShell.
|
| -UI_EXPORT bool OpenAnyViaShell(const base::string16& full_path,
|
| - const base::string16& directory,
|
| - const base::string16& args,
|
| - DWORD mask);
|
| +UI_BASE_EXPORT bool OpenAnyViaShell(const base::string16& full_path,
|
| + const base::string16& directory,
|
| + const base::string16& args,
|
| + DWORD mask);
|
|
|
| // Ask the user, via the Windows "Open With" dialog, for an application to use
|
| // to open the file specified by 'full_path'.
|
| @@ -45,11 +46,11 @@ bool OpenItemWithExternalApp(const base::string16& full_path);
|
| // Disables the ability of the specified window to be pinned to the taskbar or
|
| // the Start menu. This will remove "Pin this program to taskbar" from the
|
| // taskbar menu of the specified window.
|
| -UI_EXPORT bool PreventWindowFromPinning(HWND hwnd);
|
| +UI_BASE_EXPORT bool PreventWindowFromPinning(HWND hwnd);
|
|
|
| // Sets the application id, app icon, relaunch command and relaunch display name
|
| // for the given window.
|
| -UI_EXPORT void SetAppDetailsForWindow(
|
| +UI_BASE_EXPORT void SetAppDetailsForWindow(
|
| const base::string16& app_id,
|
| const base::string16& app_icon,
|
| const base::string16& relaunch_command,
|
| @@ -59,22 +60,23 @@ UI_EXPORT void SetAppDetailsForWindow(
|
| // Sets the application id given as the Application Model ID for the window
|
| // specified. This method is used to insure that different web applications
|
| // do not group together on the Win7 task bar.
|
| -UI_EXPORT void SetAppIdForWindow(const base::string16& app_id, HWND hwnd);
|
| +UI_BASE_EXPORT void SetAppIdForWindow(const base::string16& app_id, HWND hwnd);
|
|
|
| // Sets the application icon for the window specified.
|
| -UI_EXPORT void SetAppIconForWindow(const base::string16& app_icon, HWND hwnd);
|
| +UI_BASE_EXPORT void SetAppIconForWindow(const base::string16& app_icon,
|
| + HWND hwnd);
|
|
|
| // Sets the relaunch command and relaunch display name for the window specified.
|
| // Windows will use this information for grouping on the taskbar, and to create
|
| // a shortcut if the window is pinned to the taskbar.
|
| -UI_EXPORT void SetRelaunchDetailsForWindow(
|
| +UI_BASE_EXPORT void SetRelaunchDetailsForWindow(
|
| const base::string16& relaunch_command,
|
| const base::string16& display_name,
|
| HWND hwnd);
|
|
|
| // Returns true if composition is available and turned on on the current
|
| // platform.
|
| -UI_EXPORT bool IsAeroGlassEnabled();
|
| +UI_BASE_EXPORT bool IsAeroGlassEnabled();
|
|
|
| } // namespace win
|
| } // namespace ui
|
|
|