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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
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 "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 const gfx::Rect& initial_pos, 1455 const gfx::Rect& initial_pos,
1456 bool user_gesture) { 1456 bool user_gesture) {
1457 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture); 1457 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture);
1458 } 1458 }
1459 1459
1460 void Browser::CloseTabContents(WebContents* contents) { 1460 void Browser::CloseTabContents(WebContents* contents) {
1461 CloseContents(contents); 1461 CloseContents(contents);
1462 } 1462 }
1463 1463
1464 gfx::NativeWindow Browser::BrowserShowWebDialog( 1464 gfx::NativeWindow Browser::BrowserShowWebDialog(
1465 WebDialogDelegate* delegate, 1465 views::WebDialogDelegate* delegate,
1466 gfx::NativeWindow parent_window) { 1466 gfx::NativeWindow parent_window) {
1467 if (!parent_window) 1467 if (!parent_window)
1468 parent_window = window_->GetNativeHandle(); 1468 parent_window = window_->GetNativeHandle();
1469 1469
1470 return browser::ShowWebDialog(parent_window, profile_, this, delegate); 1470 return browser::ShowWebDialog(parent_window, profile_, this, delegate);
1471 } 1471 }
1472 1472
1473 void Browser::BrowserRenderWidgetShowing() { 1473 void Browser::BrowserRenderWidgetShowing() {
1474 RenderWidgetShowing(); 1474 RenderWidgetShowing();
1475 } 1475 }
(...skipping 4029 matching lines...) Expand 10 before | Expand all | Expand 10 after
5505 if (contents && !allow_js_access) { 5505 if (contents && !allow_js_access) {
5506 contents->web_contents()->GetController().LoadURL( 5506 contents->web_contents()->GetController().LoadURL(
5507 target_url, 5507 target_url,
5508 content::Referrer(), 5508 content::Referrer(),
5509 content::PAGE_TRANSITION_LINK, 5509 content::PAGE_TRANSITION_LINK,
5510 std::string()); // No extra headers. 5510 std::string()); // No extra headers.
5511 } 5511 }
5512 5512
5513 return contents != NULL; 5513 return contents != NULL;
5514 } 5514 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698