Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Unified Diff: ui/base/win/shell.cc

Issue 10557017: Do not set the appid and window icon in Metro (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put logic directly in ui::win::SetAppIdAndIconForWindow() instead Created 8 years, 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/win/shell.cc
diff --git a/ui/base/win/shell.cc b/ui/base/win/shell.cc
index 3081d77c1cb904731078e8efbe6105cafb860f62..a73ec3e97704327103d74a56f70b4ba15e136fdc 100644
--- a/ui/base/win/shell.cc
+++ b/ui/base/win/shell.cc
@@ -11,6 +11,7 @@
#include "base/file_path.h"
#include "base/native_library.h"
#include "base/string_util.h"
+#include "base/win/metro.h"
#include "base/win/scoped_comptr.h"
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
@@ -23,8 +24,10 @@ namespace {
void SetAppIdAndIconForWindow(const string16& app_id,
const string16& app_icon,
HWND hwnd) {
- // This functionality is only available on Win7+.
- if (base::win::GetVersion() < base::win::VERSION_WIN7)
+ // This functionality is only available on Win7+. It also doesn't make sense
+ // to do this for Chrome Metro.
+ if (base::win::GetVersion() < base::win::VERSION_WIN7 ||
+ base::win::IsMetroProcess())
return;
base::win::ScopedComPtr<IPropertyStore> pps;
HRESULT result = SHGetPropertyStoreForWindow(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698