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

Issue 554163003: Revert of Create native_viewport_service, don't build it into mojo_shell unless Android (Closed)

Created:
6 years, 3 months ago by DaveMoore
Modified:
6 years, 3 months ago
CC:
chromium-reviews, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, darin (slow to review), ben+mojo_chromium.org
Project:
chromium
Visibility:
Public.

Description

Revert of Create native_viewport_service, don't build it into mojo_shell unless Android (patchset #16 id:300001 of https://codereview.chromium.org/477923004/) Reason for revert: Broke Linux GN bot. http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/12251 Original issue's description: > Create native_viewport_service, don't build it into mojo_shell unless Android > > BUG= > > Committed: https://crrev.com/80931e51c8085d8bd44077dc1cd96bc74794e609 > Cr-Commit-Position: refs/heads/master@{#294780} TBR=darin@chromium.org,ben@chromium.org NOTREECHECKS=true NOTRY=true BUG=

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+126 lines, -215 lines) Patch
M mojo/aura/aura_init.cc View 1 chunk +1 line, -1 line 0 comments Download
M mojo/mojo.gyp View 9 chunks +26 lines, -7 lines 0 comments Download
M mojo/mojo_examples.gypi View 5 chunks +5 lines, -1 line 0 comments Download
M mojo/mojo_services.gypi View 8 chunks +5 lines, -23 lines 0 comments Download
M mojo/services/html_viewer/DEPS View 1 chunk +0 lines, -2 lines 0 comments Download
M mojo/services/html_viewer/html_viewer.cc View 2 chunks +0 lines, -17 lines 0 comments Download
M mojo/services/native_viewport/BUILD.gn View 2 chunks +9 lines, -14 lines 0 comments Download
M mojo/services/native_viewport/DEPS View 1 chunk +0 lines, -1 line 0 comments Download
D mojo/services/native_viewport/main.cc View 1 chunk +0 lines, -102 lines 0 comments Download
M mojo/services/public/cpp/view_manager/lib/BUILD.gn View 1 chunk +3 lines, -1 line 0 comments Download
M mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc View 1 chunk +1 line, -4 lines 0 comments Download
M mojo/services/public/interfaces/native_viewport/native_viewport.mojom View 1 chunk +0 lines, -7 lines 0 comments Download
M mojo/services/view_manager/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M mojo/services/view_manager/ids.h View 2 chunks +2 lines, -1 line 0 comments Download
M mojo/services/view_manager/view_manager_unittest.cc View 3 chunks +7 lines, -11 lines 0 comments Download
M mojo/services/window_manager/BUILD.gn View 1 chunk +2 lines, -1 line 0 comments Download
M mojo/shell/BUILD.gn View 3 chunks +20 lines, -1 line 0 comments Download
M mojo/shell/context.cc View 4 chunks +25 lines, -5 lines 0 comments Download
M mojo/shell/desktop/mojo_main.cc View 3 chunks +16 lines, -11 lines 0 comments Download
M mojo/shell/in_process_dynamic_service_runner.cc View 2 chunks +4 lines, -4 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
DaveMoore
Created Revert of Create native_viewport_service, don't build it into mojo_shell unless Android
6 years, 3 months ago (2014-09-15 04:32:44 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patchset/554163003/1
6 years, 3 months ago (2014-09-15 04:33:25 UTC) #2
commit-bot: I haz the power
6 years, 3 months ago (2014-09-15 04:33:42 UTC) #4
Failed to apply patch for mojo/aura/aura_init.cc:
While running git apply --index -p1;
  error: patch failed: mojo/aura/aura_init.cc:11
  error: mojo/aura/aura_init.cc: patch does not apply

Patch:       mojo/aura/aura_init.cc
Index: mojo/aura/aura_init.cc
diff --git a/mojo/aura/aura_init.cc b/mojo/aura/aura_init.cc
index
df17ab77b66ecc0546f65b9116f6ac0abc267d03..a99ce25fc3a88d448d76ea32b785c7fcb275bb95
100644
--- a/mojo/aura/aura_init.cc
+++ b/mojo/aura/aura_init.cc
@@ -11,7 +11,7 @@
 namespace mojo {
 
 AuraInit::AuraInit() {
-  aura::Env::CreateInstance(false);
+  aura::Env::CreateInstance(true);
 
   context_factory_.reset(new ContextFactoryMojo);
   aura::Env::GetInstance()->set_context_factory(context_factory_.get());

Powered by Google App Engine
This is Rietveld 408576698