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

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

Issue 10837192: Speculative revert to see if this change introduced a performance regression on Mac intl perf bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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_tab_restore_service_delegate.h" 5 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_commands.h" 8 #include "chrome/browser/ui/browser_commands.h"
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/browser_tabrestore.h" 10 #include "chrome/browser/ui/browser_tabrestore.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 Browser::CreateParams::CreateForApp( 93 Browser::CreateParams::CreateForApp(
94 Browser::TYPE_POPUP, app_name, gfx::Rect(), profile)); 94 Browser::TYPE_POPUP, app_name, gfx::Rect(), profile));
95 } 95 }
96 if (browser) 96 if (browser)
97 return browser->tab_restore_service_delegate(); 97 return browser->tab_restore_service_delegate();
98 else 98 else
99 return NULL; 99 return NULL;
100 } 100 }
101 101
102 // static 102 // static
103 TabRestoreServiceDelegate* 103 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController(
104 TabRestoreServiceDelegate::FindDelegateForWebContents( 104 const NavigationController* controller,
105 const WebContents* contents) { 105 int* index) {
106 Browser* browser = browser::FindBrowserWithWebContents(contents); 106 Browser* browser = browser::FindBrowserForController(controller, index);
107 return browser ? browser->tab_restore_service_delegate() : NULL; 107 if (browser)
108 return browser->tab_restore_service_delegate();
109 else
110 return NULL;
108 } 111 }
109 112
110 // static 113 // static
111 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID( 114 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID(
112 SessionID::id_type desired_id) { 115 SessionID::id_type desired_id) {
113 Browser* browser = browser::FindBrowserWithID(desired_id); 116 Browser* browser = browser::FindBrowserWithID(desired_id);
114 return browser ? browser->tab_restore_service_delegate() : NULL; 117 if (browser)
118 return browser->tab_restore_service_delegate();
119 else
120 return NULL;
115 } 121 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_finder.cc ('k') | chrome/browser/ui/browser_tab_strip_model_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698