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

Unified Diff: ui/views/examples/examples_with_content_main_exe.cc

Issue 288313012: Revert of Repurpose views+content example into a generic multiprocess views runtime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/examples/examples.gyp ('k') | ui/views_content_client/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples_with_content_main_exe.cc
diff --git a/ui/views/examples/examples_with_content_main_exe.cc b/ui/views/examples/examples_with_content_main_exe.cc
deleted file mode 100644
index 8df1dec30abf1f6eef44e26490f0a8d0c29d0cb9..0000000000000000000000000000000000000000
--- a/ui/views/examples/examples_with_content_main_exe.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/bind.h"
-#include "content/public/browser/browser_context.h"
-#include "ui/views/examples/examples_window_with_content.h"
-#include "ui/views_content_client/views_content_client.h"
-
-#if defined(OS_WIN)
-#include "content/public/app/startup_helper_win.h"
-#include "sandbox/win/src/sandbox_types.h"
-#endif
-
-namespace {
-
-void ShowContentExampleWindow(content::BrowserContext* browser_context,
- gfx::NativeView window_context) {
- views::examples::ShowExamplesWindowWithContent(views::examples::QUIT_ON_CLOSE,
- browser_context,
- window_context);
-
- // These lines serve no purpose other than to introduce an explicit content
- // dependency. If the main executable doesn't have this dependency, the linker
- // has more flexibility to reorder library dependencies in a shared component
- // build. On linux, this can cause libc to appear before libcontent in the
- // dlsym search path, which breaks (usually valid) assumptions made in
- // sandbox::InitLibcUrandomOverrides(). See http://crbug.com/374712.
- if (!browser_context) {
- content::BrowserContext::SaveSessionState(NULL);
- NOTREACHED();
- }
-}
-
-} // namespace
-
-#if defined(OS_WIN)
-int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
- sandbox::SandboxInterfaceInfo sandbox_info = {0};
- content::InitializeSandboxInfo(&sandbox_info);
- ui::ViewsContentClient views_content_client(instance, &sandbox_info);
-#else
-int main(int argc, const char** argv) {
- ui::ViewsContentClient views_content_client(argc, argv);
-#endif
-
- views_content_client.set_task(base::Bind(&ShowContentExampleWindow));
- return views_content_client.RunMain();
-}
« no previous file with comments | « ui/views/examples/examples.gyp ('k') | ui/views_content_client/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698