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

Side by Side Diff: ui/app_list/demo/app_list_demo_views.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « ui/android/ui_android.gyp ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 message_loop->DeleteSoon(FROM_HERE, this); 90 message_loop->DeleteSoon(FROM_HERE, this);
91 message_loop->QuitWhenIdle(); 91 message_loop->QuitWhenIdle();
92 } 92 }
93 93
94 views::View* DemoAppListViewDelegate::CreateStartPageWebView( 94 views::View* DemoAppListViewDelegate::CreateStartPageWebView(
95 const gfx::Size& size) { 95 const gfx::Size& size) {
96 web_contents_.reset(content::WebContents::Create( 96 web_contents_.reset(content::WebContents::Create(
97 content::WebContents::CreateParams(browser_context_))); 97 content::WebContents::CreateParams(browser_context_)));
98 web_contents_->GetController().LoadURL(GURL("http://www.google.com/"), 98 web_contents_->GetController().LoadURL(GURL("http://www.google.com/"),
99 content::Referrer(), 99 content::Referrer(),
100 content::PAGE_TRANSITION_AUTO_TOPLEVEL, 100 ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
101 std::string()); 101 std::string());
102 views::WebView* web_view = new views::WebView( 102 views::WebView* web_view = new views::WebView(
103 web_contents_->GetBrowserContext()); 103 web_contents_->GetBrowserContext());
104 web_view->SetPreferredSize(size); 104 web_view->SetPreferredSize(size);
105 web_view->SetWebContents(web_contents_.get()); 105 web_view->SetWebContents(web_contents_.get());
106 return web_view; 106 return web_view;
107 } 107 }
108 108
109 void ShowAppList(content::BrowserContext* browser_context, 109 void ShowAppList(content::BrowserContext* browser_context,
110 gfx::NativeWindow window_context) { 110 gfx::NativeWindow window_context) {
(...skipping 12 matching lines...) Expand all
123 content::InitializeSandboxInfo(&sandbox_info); 123 content::InitializeSandboxInfo(&sandbox_info);
124 ui::ViewsContentClient views_content_client(instance, &sandbox_info); 124 ui::ViewsContentClient views_content_client(instance, &sandbox_info);
125 #else 125 #else
126 int main(int argc, const char** argv) { 126 int main(int argc, const char** argv) {
127 ui::ViewsContentClient views_content_client(argc, argv); 127 ui::ViewsContentClient views_content_client(argc, argv);
128 #endif 128 #endif
129 129
130 views_content_client.set_task(base::Bind(&ShowAppList)); 130 views_content_client.set_task(base::Bind(&ShowAppList));
131 return views_content_client.RunMain(); 131 return views_content_client.RunMain();
132 } 132 }
OLDNEW
« no previous file with comments | « ui/android/ui_android.gyp ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698