diff options
Diffstat (limited to 'chrome/browser/tab_contents')
6 files changed, 17 insertions, 11 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 54fdbf8..59d76443 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -47,6 +47,7 @@ #include "chrome/browser/translate/translate_prefs.h" #include "chrome/browser/translate/translate_tab_helper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" @@ -1690,7 +1691,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { case IDC_CONTENT_CONTEXT_VIEWPAGEINFO: { NavigationController* controller = &source_web_contents_->GetController(); NavigationEntry* nav_entry = controller->GetActiveEntry(); - Browser* browser = Browser::GetBrowserForController(controller, NULL); + Browser* browser = browser::FindBrowserForController(controller, NULL); browser->ShowPageInfo(source_web_contents_, nav_entry->GetURL(), nav_entry->GetSSL(), true); break; @@ -1732,7 +1733,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { break; case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: { - Browser* browser = Browser::GetBrowserForController( + Browser* browser = browser::FindBrowserForController( &source_web_contents_->GetController(), NULL); browser->ShowPageInfo(source_web_contents_, params_.frame_url, params_.security_info, false); diff --git a/chrome/browser/tab_contents/spelling_bubble_model.cc b/chrome/browser/tab_contents/spelling_bubble_model.cc index b9c9ae3..2dfcd6a 100644 --- a/chrome/browser/tab_contents/spelling_bubble_model.cc +++ b/chrome/browser/tab_contents/spelling_bubble_model.cc @@ -7,7 +7,8 @@ #include "base/logging.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" @@ -60,7 +61,7 @@ string16 SpellingBubbleModel::GetLinkText() const { } void SpellingBubbleModel::LinkClicked() { - Browser* browser = BrowserList::GetLastActiveWithProfile(profile_); + Browser* browser = browser::FindLastActiveWithProfile(profile_); OpenURLParams params( GURL(chrome::kPrivacyLearnMoreURL), Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false); diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc b/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc index 35de5a5..ef9f12e 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc @@ -6,6 +6,7 @@ #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" @@ -68,7 +69,7 @@ void WebDragBookmarkHandlerAura::OnDrop() { } // Focus the target browser. - Browser* browser = Browser::GetBrowserForController( + Browser* browser = browser::FindBrowserForController( &tab_->web_contents()->GetController(), NULL); if (browser) browser->window()->Show(); diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc b/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc index c80bb06..8f075c4 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" @@ -83,7 +84,7 @@ void WebDragBookmarkHandlerGtk::OnDrop() { } // Focus the target browser. - Browser* browser = Browser::GetBrowserForController( + Browser* browser = browser::FindBrowserForController( &tab_->web_contents()->GetController(), NULL); if (browser) browser->window()->Show(); diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm b/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm index 91f461b..e0ed038 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm @@ -1,10 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" @@ -50,7 +51,7 @@ void WebDragBookmarkHandlerMac::OnDrop() { } // Focus the target browser. - Browser* browser = Browser::GetBrowserForController( + Browser* browser = browser::FindBrowserForController( &tab_->web_contents()->GetController(), NULL); if (browser) browser->window()->Show(); diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc b/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc index c74452c..fab2241 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" @@ -74,7 +75,7 @@ void WebDragBookmarkHandlerWin::OnDrop(IDataObject* data_object) { } // Focus the target browser. - Browser* browser = Browser::GetBrowserForController( + Browser* browser = browser::FindBrowserForController( &tab_->web_contents()->GetController(), NULL); if (browser) browser->window()->Show(); |