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

Side by Side Diff: ui/views/controls/webview/webview.cc

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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/views/cocoa/views_nswindow_delegate.mm ('k') | ui/views/examples/widget_example.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/controls/webview/webview.h" 5 #include "ui/views/controls/webview/webview.h"
6 6
7 #include "content/public/browser/browser_accessibility_state.h" 7 #include "content/public/browser/browser_accessibility_state.h"
8 #include "content/public/browser/browser_context.h" 8 #include "content/public/browser/browser_context.h"
9 #include "content/public/browser/navigation_controller.h" 9 #include "content/public/browser/navigation_controller.h"
10 #include "content/public/browser/render_view_host.h" 10 #include "content/public/browser/render_view_host.h"
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 content::BrowserContext* browser_context) { 359 content::BrowserContext* browser_context) {
360 content::WebContents* contents = NULL; 360 content::WebContents* contents = NULL;
361 if (ViewsDelegate::views_delegate) { 361 if (ViewsDelegate::views_delegate) {
362 contents = ViewsDelegate::views_delegate->CreateWebContents( 362 contents = ViewsDelegate::views_delegate->CreateWebContents(
363 browser_context, NULL); 363 browser_context, NULL);
364 } 364 }
365 365
366 if (!contents) { 366 if (!contents) {
367 content::WebContents::CreateParams create_params( 367 content::WebContents::CreateParams create_params(
368 browser_context, NULL); 368 browser_context, NULL);
369 create_params.context = GetWidget()->GetNativeView();
369 return content::WebContents::Create(create_params); 370 return content::WebContents::Create(create_params);
370 } 371 }
371 372
372 return contents; 373 return contents;
373 } 374 }
374 375
375 } // namespace views 376 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/cocoa/views_nswindow_delegate.mm ('k') | ui/views/examples/widget_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698