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

Unified Diff: chrome/browser/chromeos/extensions/file_manager_util.cc

Issue 10391158: Moves methods for finding browsers to browser_finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include fixs 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_manager_util.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index 1cc825d14530308ccc4573e29975b9e5d18fed59..cad5222886e7f546a61c679d7c642b0db8ccf1a5 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/simple_message_box.h"
@@ -218,7 +219,7 @@ DictionaryValue* ProgessStatusToDictionaryValue(
void OpenNewTab(const GURL& url, Profile* profile) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- Browser* browser = Browser::GetOrCreateTabbedBrowser(
+ Browser* browser = browser::FindOrCreateTabbedBrowser(
profile ? profile : ProfileManager::GetDefaultProfileOrOffTheRecord());
browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK);
// If the current browser is not tabbed then the new tab will be created
@@ -228,7 +229,9 @@ void OpenNewTab(const GURL& url, Profile* profile) {
// Shows a warning message box saying that the file could not be opened.
void ShowWarningMessageBox(Profile* profile, const FilePath& path) {
- Browser* browser = Browser::GetOrCreateTabbedBrowser(profile);
+ // TODO: if FindOrCreateTabbedBrowser creates a new browser the returned
+ // browser is leaked.
+ Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
browser::ShowMessageBox(
browser->window()->GetNativeHandle(),
l10n_util::GetStringFUTF16(
@@ -503,7 +506,7 @@ class StandaloneExecutor : public FileTaskExecutor {
protected :
// FileTaskExecutor overrides.
virtual Browser* browser() {
- return Browser::GetOrCreateTabbedBrowser(profile());
+ return browser::FindOrCreateTabbedBrowser(profile());
}
virtual void Done(bool) {}
};

Powered by Google App Engine
This is Rietveld 408576698