Remove ui/base/win/metro.* and use base/win/metro.*

BUG=
TEST=


Review URL: http://codereview.chromium.org/10191023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134045 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 40 deletions

diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index 1a30069..6558e45 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -6,10 +6,10 @@
 
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/win/metro.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_data_dll_win.h"
 #include "ui/base/win/dpi.h"
-#include "ui/base/win/metro.h"
 
 namespace ui {
 
@@ -45,7 +45,7 @@ void ResourceBundle::LoadCommonResources() {
 
   bool use_metro_pak = false;
 #if defined(ENABLE_METRO)
-  use_metro_pak = ui::IsInMetroMode();
+  use_metro_pak = base::win::GetMetroModule() != NULL;
 #endif
 
   if (use_metro_pak) {
diff --git a/ui/base/win/metro.cc b/ui/base/win/metro.cc
deleted file mode 100644
index 1426278..0000000
--- a/ui/base/win/metro.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "ui/base/win/metro.h"
-
-#include <string>
-#include <windows.h>
-
-namespace ui {
-
-bool IsInMetroMode() {
-  const char* kMetroModeEnvVar = "CHROME_METRO_DLL";
-  char buffer[2];
-  if (!::GetEnvironmentVariableA(kMetroModeEnvVar, buffer, arraysize(buffer)))
-    return false;
-  return buffer == std::string("1");
-}
-
-}  // namespace ui
diff --git a/ui/base/win/metro.h b/ui/base/win/metro.h
deleted file mode 100644
index 6f7ff87..0000000
--- a/ui/base/win/metro.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2012 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 UI_BASE_WIN_METRO_H_
-#define UI_BASE_WIN_METRO_H_
-#pragma once
-
-#include "base/basictypes.h"
-#include "ui/base/ui_export.h"
-
-namespace ui {
-
-UI_EXPORT bool IsInMetroMode();
-
-}  // namespace ui
-
-#endif  // UI_BASE_WIN_METRO_H_