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

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

Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_list.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 return tab_contents->tab_contents(); 1249 return tab_contents->tab_contents();
1250 } 1250 }
1251 1251
1252 void Browser::AddWebContents(WebContents* new_contents, 1252 void Browser::AddWebContents(WebContents* new_contents,
1253 WindowOpenDisposition disposition, 1253 WindowOpenDisposition disposition,
1254 const gfx::Rect& initial_pos, 1254 const gfx::Rect& initial_pos,
1255 bool user_gesture) { 1255 bool user_gesture) {
1256 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture); 1256 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture);
1257 } 1257 }
1258 1258
1259 void Browser::CloseTabContents(TabContents* contents) { 1259 void Browser::CloseTabContents(WebContents* contents) {
1260 CloseContents(contents); 1260 CloseContents(contents);
1261 } 1261 }
1262 1262
1263 gfx::NativeWindow Browser::BrowserShowHtmlDialog( 1263 gfx::NativeWindow Browser::BrowserShowHtmlDialog(
1264 HtmlDialogUIDelegate* delegate, 1264 HtmlDialogUIDelegate* delegate,
1265 gfx::NativeWindow parent_window, 1265 gfx::NativeWindow parent_window,
1266 DialogStyle style) { 1266 DialogStyle style) {
1267 #if defined(OS_CHROMEOS) 1267 #if defined(OS_CHROMEOS)
1268 // For Chrome OS, first try to parent the dialog over the current browser -- 1268 // For Chrome OS, first try to parent the dialog over the current browser --
1269 // it's likely to be maximized onscreen. If it isn't tabbed (e.g. it's a 1269 // it's likely to be maximized onscreen. If it isn't tabbed (e.g. it's a
(...skipping 4121 matching lines...) Expand 10 before | Expand all | Expand 10 after
5391 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5391 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5392 } else { 5392 } else {
5393 GlobalErrorService* service = 5393 GlobalErrorService* service =
5394 GlobalErrorServiceFactory::GetForProfile(profile()); 5394 GlobalErrorServiceFactory::GetForProfile(profile());
5395 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5395 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5396 if (error) { 5396 if (error) {
5397 error->ShowBubbleView(this); 5397 error->ShowBubbleView(this);
5398 } 5398 }
5399 } 5399 }
5400 } 5400 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698