content/shell/browser/shell_browser_main.cc - Issue 23316003: [content shell] move browser process stuff into browser/ subdir

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: content/shell/browser/shell_browser_main.cc

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 4 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: content/shell/browser/shell_browser_main.cc

diff --git a/content/shell/shell_browser_main.cc b/content/shell/browser/shell_browser_main.cc

similarity index 97%

rename from content/shell/shell_browser_main.cc

rename to content/shell/browser/shell_browser_main.cc

index a267fe27fc760644157023731845e055b2618c64..bf41b16da33cc3776f6d69991a9731e7a7ee279b 100644

--- a/content/shell/shell_browser_main.cc

+++ b/content/shell/browser/shell_browser_main.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "content/shell/shell_browser_main.h"

+#include "content/shell/browser/shell_browser_main.h"

#include <iostream>

@@ -17,16 +17,16 @@

#include "base/strings/utf_string_conversions.h"

#include "base/threading/thread_restrictions.h"

#include "content/public/browser/browser_main_runner.h"

+#include "content/shell/browser/shell.h"

+#include "content/shell/browser/webkit_test_controller.h"

#include "content/shell/common/shell_switches.h"

#include "content/shell/common/webkit_test_helpers.h"

-#include "content/shell/shell.h"

-#include "content/shell/webkit_test_controller.h"

#include "net/base/net_util.h"

#include "webkit/support/webkit_support.h"

#if defined(OS_ANDROID)

#include "base/run_loop.h"

-#include "content/shell/shell_layout_tests_android.h"

+#include "content/shell/browser/shell_layout_tests_android.h"

#endif

namespace {