Skip to content

Commit

Permalink
Reland of move remote tree host and some related input and metro_driv…
Browse files Browse the repository at this point in the history
…er code (patchset chromium#1 id:1 of https://codereview.chromium.org/1602403002/ )

Reason for revert:
Didn't help, looks like the slave is out of disk space.

Original issue's description:
> Revert of Remove remote tree host and some related input and metro_driver code (patchset chromium#5 id:80001 of https://codereview.chromium.org/1586843002/ )
>
> Reason for revert:
> Suspecting that this is breaking the Webkit Win (dbg) builder.
>
> First failed build:
> https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder%20%28dbg%29/builds/88362
>
> Original issue's description:
> > Remove remote tree host and some related input and metro_driver code
> >
> > Part of continued stripping out of Metro/Win8/Immersive mode.
> >
> > BUG=558054
> >
> > Committed: https://crrev.com/5cc04f70e424020d8afe49bdc4c1c76683f0ea7b
> > Cr-Commit-Position: refs/heads/master@{#370068}
>
> TBR=sky@chromium.org,thestig@chromium.org,shuchen@chromium.org,ananta@chromium.org,dpranke@chromium.org,scottmg@chromium.org
> NOTRY=true
> NOPRESUBMIT=true
> NOTREECHECKS=true
> BUG=558054
>
> Committed: https://crrev.com/0e3a9fd80a26f1fce889200d330d79e64d7a2586
> Cr-Commit-Position: refs/heads/master@{#370290}

TBR=ananta@chromium.org,dpranke@chromium.org,scottmg@chromium.org,shuchen@chromium.org,sky@chromium.org,thestig@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=558054

Review URL: https://codereview.chromium.org/1605253002

Cr-Commit-Position: refs/heads/master@{#370300}
  • Loading branch information
lisamuel authored and Commit bot committed Jan 20, 2016
1 parent 33ced7a commit 6d8217f
Show file tree
Hide file tree
Showing 63 changed files with 4 additions and 8,006 deletions.
2 changes: 0 additions & 2 deletions ash/ash.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@
'gpu_support_stub.h',
'high_contrast/high_contrast_controller.cc',
'high_contrast/high_contrast_controller.h',
'host/ash_remote_window_tree_host_win.cc',
'host/ash_remote_window_tree_host_win.h',
'host/ash_window_tree_host.cc',
'host/ash_window_tree_host.h',
'host/ash_window_tree_host_init_params.cc',
Expand Down
16 changes: 1 addition & 15 deletions ash/ash_unittests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
},
}],
['OS=="win" or chromeos==1', {
['chromeos==1', {
'variables': {
'files': [
'../testing/test_env.py',
Expand All @@ -52,20 +52,6 @@
],
},
}],
['OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.dll',
],
},
}],
['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'files': [
'<(PRODUCT_DIR)/ash_unittests.exe.pdb',
],
},
}],
],
'includes': [
'../base/base.isolate',
Expand Down
71 changes: 0 additions & 71 deletions ash/host/ash_remote_window_tree_host_win.cc

This file was deleted.

53 changes: 0 additions & 53 deletions ash/host/ash_remote_window_tree_host_win.h

This file was deleted.

6 changes: 0 additions & 6 deletions ash/host/ash_window_tree_host_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "ash/ash_export.h"
#include "ash/ash_switches.h"
#include "ash/host/ash_remote_window_tree_host_win.h"
#include "ash/host/ash_window_tree_host_init_params.h"
#include "ash/host/root_window_transformer.h"
#include "ash/host/transformer_helper.h"
Expand Down Expand Up @@ -123,11 +122,6 @@ class AshWindowTreeHostWin : public AshWindowTreeHost,

AshWindowTreeHost* AshWindowTreeHost::Create(
const AshWindowTreeHostInitParams& init_params) {
if (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
ash::switches::kForceAshToDesktop))
return new AshRemoteWindowTreeHostWin(init_params.remote_hwnd);

return new AshWindowTreeHostWin(init_params.initial_bounds);
}

Expand Down
1 change: 0 additions & 1 deletion ash/test/ash_test_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

#if defined(OS_WIN)
#include "base/win/windows_version.h"
#include "ui/aura/remote_window_tree_host_win.h"
#include "ui/platform_window/win/win_window.h"
#include "win8/test/test_registrar_constants.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion build/gn_migration.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@
'../third_party/codesighs/codesighs.gyp:msdump2symdb',
'../third_party/codesighs/codesighs.gyp:msmap2tsv',
'../third_party/pdfium/samples/samples.gyp:pdfium_diff',
'../win8/win8.gyp:metro_viewer',
],
}],
['chromecast==1', {
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,6 @@ source_set("browser") {
"//third_party/isimpledom",
"//third_party/wtl",
"//ui/metro_viewer",
"//win8:metro_viewer",
]

all_dependent_configs = [ ":browser_win_linker_flags" ]
Expand Down
2 changes: 0 additions & 2 deletions chrome/browser/browser_process_platform_part.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
#include "chrome/browser/browser_process_platform_part_chromeos.h"
#elif defined(OS_MACOSX) && !defined(OS_IOS)
#include "chrome/browser/browser_process_platform_part_mac.h"
#elif defined(OS_WIN)
#include "chrome/browser/browser_process_platform_part_aurawin.h"
#else
#include "chrome/browser/browser_process_platform_part_base.h"
typedef BrowserProcessPlatformPartBase BrowserProcessPlatformPart;
Expand Down
72 changes: 0 additions & 72 deletions chrome/browser/browser_process_platform_part_aurawin.cc

This file was deleted.

45 changes: 0 additions & 45 deletions chrome/browser/browser_process_platform_part_aurawin.h

This file was deleted.

9 changes: 0 additions & 9 deletions chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@
#include "extensions/browser/notification_types.h"
#include "ui/base/l10n/l10n_util.h"

#if defined(OS_WIN)
#include "ui/aura/remote_window_tree_host_win.h"
#endif

using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
using bookmarks::ManagedBookmarkService;
Expand Down Expand Up @@ -798,11 +794,6 @@ void BookmarksIOFunction::ShowSelectFileDialog(
gfx::NativeWindow owning_window = web_contents ?
platform_util::GetTopLevel(web_contents->GetNativeView())
: NULL;
#if defined(OS_WIN)
if (!owning_window &&
chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
owning_window = aura::RemoteWindowTreeHostWin::Instance()->GetAshWindow();
#endif
// |web_contents| can be NULL (for background pages), which is fine. In such
// a case if file-selection dialogs are forbidden by policy, we will not
// show an InfoBar, which is better than letting one appear out of the blue.
Expand Down
3 changes: 0 additions & 3 deletions chrome/browser/metro_viewer/DEPS

This file was deleted.

3 changes: 0 additions & 3 deletions chrome/browser/metro_viewer/OWNERS

This file was deleted.

Loading

0 comments on commit 6d8217f

Please sign in to comment.