athena/main/athena_main.cc - Issue 314303004: Use webview in web activity

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/main/athena_main.cc

Issue 314303004: Use webview in web activity (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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:

Index: athena/main/athena_main.cc

diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc

index 90f0343515e026f1b3fe490ba9ac4055310ba200..99f5fa0ae256098adc0cb3f90e6b386e16ac2ce7 100644

--- a/athena/main/athena_main.cc

+++ b/athena/main/athena_main.cc

@@ -8,7 +8,6 @@

#include "athena/content/public/content_activity_factory.h"

#include "athena/main/athena_launcher.h"

#include "athena/main/placeholder.h"

-#include "athena/main/placeholder_content.h"

#include "content/public/app/content_main.h"

#include "ui/aura/window_tree_host.h"

#include "ui/wm/core/visibility_controller.h"

@@ -23,7 +22,6 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {

athena::StartAthena(

apps::ShellDesktopController::instance()->host()->window(),

new athena::ContentActivityFactory());

- CreateTestWindows();

CreateTestPages(context);

}

« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »