diff options
| author | scottmg <scottmg@chromium.org> | 2016-01-12 12:19:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-12 20:20:39 +0000 |
| commit | 969ea45d00215441dd9aa4f5fa2527546e3f5f87 (patch) | |
| tree | f5238649ffe00b2b4f485f5af014e609f6045f4a /win8 | |
| parent | adf563e03f041f23c1389dbb45a2aede5e7a282a (diff) | |
| download | chromium_src-969ea45d00215441dd9aa4f5fa2527546e3f5f87.zip chromium_src-969ea45d00215441dd9aa4f5fa2527546e3f5f87.tar.gz chromium_src-969ea45d00215441dd9aa4f5fa2527546e3f5f87.tar.bz2 | |
Remove base/win/metro.{cc|h} and some associated code
The goal was to start by removing base/win/metro.{cc|h}, but this
ended up touching a number of places. So, also removed are:
chrome/browser/metro_utils/
chrome/browser/ui/apps/apps_metro_handler_win.{cc|h}
chrome/browser/ui/metro_pin_tab_helper_win.{cc|h}
chrome/browser/ui/views/frame/browser_frame_ashwin.{cc|h}
In order for the CL to not get even larger, there are some added TODOs
pointing at the associated bug where calls to the above were removed,
but the surrounding code is not yet simplified.
BUG=558054
Review URL: https://codereview.chromium.org/1581473002
Cr-Commit-Position: refs/heads/master@{#368971}
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 22 | ||||
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 1 | ||||
| -rw-r--r-- | win8/metro_driver/file_picker_ash.cc | 1 |
3 files changed, 1 insertions, 23 deletions
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index 73f66cf..236f862 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -14,7 +14,6 @@ #include "base/path_service.h" #include "base/process/launch.h" #include "base/strings/utf_string_conversions.h" -#include "base/win/metro.h" #include "base/win/registry.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_handle.h" @@ -487,26 +486,7 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() { return launch_mode; } - if (!base::win::IsChromeMetroSupported()) { - launch_mode = ECHUIM_DESKTOP; - launch_mode_determined = true; - return launch_mode; - } - - // Use the previous mode if available. Else launch in desktop mode. - DWORD reg_value; - if (reg_key.ReadValueDW(chrome::kLaunchModeValue, - ®_value) != ERROR_SUCCESS) { - launch_mode = ECHUIM_DESKTOP; - AtlTrace("Can't read registry, defaulting to %s\n", modes[launch_mode]); - } else if (reg_value >= ECHUIM_SYSTEM_LAUNCHER) { - AtlTrace("Invalid registry launch mode value %u\n", reg_value); - launch_mode = ECHUIM_DESKTOP; - } else { - launch_mode = static_cast<EC_HOST_UI_MODE>(reg_value); - AtlTrace("Launch mode forced by registry to %s\n", modes[launch_mode]); - } - + launch_mode = ECHUIM_DESKTOP; launch_mode_determined = true; return launch_mode; } diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 2615ba6..01f9ba2 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -17,7 +17,6 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/single_thread_task_runner.h" -#include "base/win/metro.h" #include "base/win/windows_version.h" #include "chrome/common/chrome_switches.h" #include "ipc/ipc_channel.h" diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc index 8cafb73..31e699d 100644 --- a/win8/metro_driver/file_picker_ash.cc +++ b/win8/metro_driver/file_picker_ash.cc @@ -14,7 +14,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/synchronization/waitable_event.h" -#include "base/win/metro.h" #include "base/win/scoped_comptr.h" #include "ui/metro_viewer/metro_viewer_messages.h" #include "win8/metro_driver/chrome_app_view_ash.h" |