diff options
Diffstat (limited to 'chrome')
59 files changed, 87 insertions, 87 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index ed0e35f..364ac75 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -471,7 +471,7 @@ Browser* AutomationProvider::FindAndActivateTab( content::WebContentsDelegate* d = controller->GetWebContents()->GetDelegate(); if (d) d->ActivateContents(controller->GetWebContents()); - return browser::FindBrowserWithWebContents(controller->GetWebContents()); + return chrome::FindBrowserWithWebContents(controller->GetWebContents()); } void AutomationProvider::HandleFindRequest( diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 5e3f044..2a048d2 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -515,7 +515,7 @@ void TestingAutomationProvider::CloseTab(int tab_handle, IPC::Message* reply_message) { if (tab_tracker_->ContainsHandle(tab_handle)) { NavigationController* controller = tab_tracker_->GetResource(tab_handle); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( controller->GetWebContents()); DCHECK(browser); new TabClosedNotificationObserver(this, wait_until_closed, reply_message, @@ -1034,7 +1034,7 @@ void TestingAutomationProvider::GetTabIndex(int handle, int* tabstrip_index) { if (tab_tracker_->ContainsHandle(handle)) { NavigationController* tab = tab_tracker_->GetResource(handle); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( tab->GetWebContents()); *tabstrip_index = browser->tab_strip_model()->GetIndexOfWebContents( tab->GetWebContents()); diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc index 3eeec39..fc7e9d9 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc @@ -240,7 +240,7 @@ CaptivePortalTabReloader* CaptivePortalTabHelper::GetTabReloaderForTest() { } void CaptivePortalTabHelper::OpenLoginTab() { - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); // If the Profile doesn't have a tabbed browser window open, do nothing. if (!browser) diff --git a/chrome/browser/extensions/app_notify_channel_ui_impl.cc b/chrome/browser/extensions/app_notify_channel_ui_impl.cc index a99940b..cd37537 100644 --- a/chrome/browser/extensions/app_notify_channel_ui_impl.cc +++ b/chrome/browser/extensions/app_notify_channel_ui_impl.cc @@ -169,7 +169,7 @@ void AppNotifyChannelUIImpl::OnInfoBarResult(bool accepted) { } } // Any existing UI is now closed - display new login UI. - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( tab_contents_->web_contents()); chrome::ShowSettingsSubPage(browser, chrome::kSyncSetupForceLoginSubPage); } diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index f72319a..aeddfff 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -438,7 +438,7 @@ void ExtensionHost::WebIntentDispatch( scoped_ptr<content::WebIntentsDispatcher> dispatcher(intents_dispatcher); Browser* browser = view() ? view()->browser() - : browser::FindBrowserWithWebContents(web_contents); + : chrome::FindBrowserWithWebContents(web_contents); // For background scripts/pages, there will be no view(). In this case, we // want to treat the intent as a browser-initiated one and deliver it into the diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 15eab00..729deb5 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -268,7 +268,7 @@ void ExtensionTabUtil::ForEachTab( // static extensions::WindowController* ExtensionTabUtil::GetWindowControllerOfTab( const WebContents* web_contents) { - Browser* browser = browser::FindBrowserWithWebContents(web_contents); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents); if (browser != NULL) return browser->extension_window_controller(); diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 180d40d..f1737c1 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -517,7 +517,7 @@ void FirstRunBubbleLauncher::Observe( const content::NotificationSource& source, const content::NotificationDetails& details) { DCHECK_EQ(type, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( content::Source<content::WebContents>(source).ptr()); if (!browser || !browser->is_type_tabbed()) return; diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc index 5c38373..c22ac88 100644 --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc @@ -136,7 +136,7 @@ void HistoryTabHelper::DidNavigateAnyFrame( #if !defined(OS_ANDROID) // Don't update history if this web contents isn't associatd with a tab. - Browser* browser = browser::FindBrowserWithWebContents(web_contents()); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); if (!browser || browser->is_app()) return; #endif diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc index 868f332..a2076d5 100644 --- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc +++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc @@ -57,7 +57,7 @@ void GoBackToSafety(content::WebContents* web_contents) { // If this is the last tab, open a new window. if (BrowserList::size() == 1) { Browser* browser = *(BrowserList::begin()); - DCHECK(browser == browser::FindBrowserWithWebContents(web_contents)); + DCHECK(browser == chrome::FindBrowserWithWebContents(web_contents)); if (browser->tab_count() == 1) chrome::NewEmptyWindow(browser->profile()); } diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index 8f42aac..72f5642 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -221,7 +221,7 @@ void OmniboxSearchHint::ShowInfoBar() { } void OmniboxSearchHint::ShowEnteringQuery() { - LocationBar* location_bar = browser::FindBrowserWithWebContents( + LocationBar* location_bar = chrome::FindBrowserWithWebContents( web_contents_)->window()->GetLocationBar(); OmniboxView* omnibox_view = location_bar->GetLocationEntry(); location_bar->FocusLocation(true); diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc index afb809d..bb1ee11 100644 --- a/chrome/browser/printing/print_preview_tab_controller.cc +++ b/chrome/browser/printing/print_preview_tab_controller.cc @@ -211,7 +211,7 @@ void PrintPreviewWebContentDelegate::HandleKeyboardEvent( // Disabled on Mac due to http://crbug.com/112173 #if !defined(OS_MACOSX) Browser* current_browser = - browser::FindBrowserWithWebContents(tab_->web_contents()); + chrome::FindBrowserWithWebContents(tab_->web_contents()); if (!current_browser) return; current_browser->window()->HandleKeyboardEvent(event); diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index a14c22d..fbc1830 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -277,7 +277,7 @@ void TabLoader::LoadNextTab() { tab->LoadIfNecessary(); content::WebContents* contents = tab->GetWebContents(); if (contents) { - Browser* browser = browser::FindBrowserWithWebContents(contents); + Browser* browser = chrome::FindBrowserWithWebContents(contents); if (browser && chrome::GetActiveWebContents(browser) != contents) { // By default tabs are marked as visible. As only the active tab is // visible we need to explicitly tell non-active tabs they are hidden. @@ -1173,7 +1173,7 @@ void SessionRestore::RestoreForeignSessionTab( content::WebContents* source_web_contents, const SessionTab& tab, WindowOpenDisposition disposition) { - Browser* browser = browser::FindBrowserWithWebContents(source_web_contents); + Browser* browser = chrome::FindBrowserWithWebContents(source_web_contents); Profile* profile = browser->profile(); std::vector<GURL> gurls; SessionRestoreImpl restorer(profile, browser, true, false, false, gurls); diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index c5a19cc..2dac738 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -1028,7 +1028,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const { if (source_web_contents_->GetController().GetActiveEntry() == NULL) return false; // Disabled if no browser is associated (e.g. desktop notifications). - if (browser::FindBrowserWithWebContents(source_web_contents_) == NULL) + if (chrome::FindBrowserWithWebContents(source_web_contents_) == NULL) return false; return true; @@ -1218,7 +1218,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const { return true; case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: // Disabled if no browser is associated (e.g. desktop notifications). - if (browser::FindBrowserWithWebContents(source_web_contents_) == NULL) + if (chrome::FindBrowserWithWebContents(source_web_contents_) == NULL) return false; return true; @@ -1353,7 +1353,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { switch (id) { case IDC_CONTENT_CONTEXT_OPENLINKNEWTAB: { Browser* browser = - browser::FindBrowserWithWebContents(source_web_contents_); + chrome::FindBrowserWithWebContents(source_web_contents_); OpenURL( params_.link_url, params_.frame_url.is_empty() ? params_.page_url : params_.frame_url, @@ -1585,7 +1585,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { NavigationController* controller = &source_web_contents_->GetController(); NavigationEntry* nav_entry = controller->GetActiveEntry(); Browser* browser = - browser::FindBrowserWithWebContents(source_web_contents_); + chrome::FindBrowserWithWebContents(source_web_contents_); chrome::ShowPageInfo(browser, source_web_contents_, nav_entry->GetURL(), nav_entry->GetSSL(), true); break; @@ -1625,7 +1625,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { break; case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: { - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( source_web_contents_); chrome::ShowPageInfo(browser, source_web_contents_, params_.frame_url, params_.security_info, 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 7bd23b5..c074236 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc @@ -69,7 +69,7 @@ void WebDragBookmarkHandlerAura::OnDrop() { } // Focus the target browser. - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); 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 f26d502..01e7659 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc @@ -83,7 +83,7 @@ void WebDragBookmarkHandlerGtk::OnDrop() { } // Focus the target browser. - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); 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 a2ce829..e7a9a7d 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm @@ -51,7 +51,7 @@ void WebDragBookmarkHandlerMac::OnDrop() { } // Focus the target browser. - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); 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 827796e..37172a8 100644 --- a/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc +++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc @@ -75,7 +75,7 @@ void WebDragBookmarkHandlerWin::OnDrop(IDataObject* data_object) { } // Focus the target browser. - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); if (browser) browser->window()->Show(); } diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index cd3be35..13b5c75 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -670,7 +670,7 @@ void TranslateManager::RevertTranslation(WebContents* web_contents) { void TranslateManager::ReportLanguageDetectionError(WebContents* web_contents) { UMA_HISTOGRAM_COUNTS("Translate.ReportLanguageDetectionError", 1); // We'll open the URL in a new tab so that the user can tell us more. - Browser* browser = browser::FindBrowserWithWebContents(web_contents); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents); if (!browser) { NOTREACHED(); return; diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc index 37d2509..dcba928 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc @@ -429,7 +429,7 @@ void ChromeLauncherControllerPerApp::ActivateApp(const std::string& app_id, TabContents* tab = *tab_i; const GURL tab_url = tab->web_contents()->GetURL(); if (refocus_pattern.MatchesURL(tab_url)) { - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( tab->web_contents()); TabStripModel* tab_strip = browser->tab_strip_model(); int index = tab_strip->GetIndexOfTabContents(tab); @@ -1056,7 +1056,7 @@ ash::LauncherID ChromeLauncherControllerPerApp::InsertAppLauncherItem( TabContents* active_tab = GetLastActiveTabContents(app_id); if (active_tab) { - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( active_tab->web_contents()); DCHECK(browser); if (browser->window()->IsActive()) diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc index 4248c15..b72cb25 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc @@ -432,7 +432,7 @@ void ChromeLauncherControllerPerBrowser::ActivateApp(const std::string& app_id, TabContents* tab = *tab_i; const GURL tab_url = tab->web_contents()->GetURL(); if (refocus_pattern.MatchesURL(tab_url)) { - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( tab->web_contents()); TabStripModel* tab_strip = browser->tab_strip_model(); int index = tab_strip->GetIndexOfTabContents(tab); @@ -1062,7 +1062,7 @@ ash::LauncherID ChromeLauncherControllerPerBrowser::InsertAppLauncherItem( TabContents* active_tab = GetLastActiveTabContents(app_id); if (active_tab) { - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( active_tab->web_contents()); DCHECK(browser); if (browser->window()->IsActive()) diff --git a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc index 1a2ec37..8f80070 100644 --- a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc +++ b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc @@ -65,7 +65,7 @@ void TabAutofillManagerDelegate::ShowAutofillSettings() { #if defined(OS_ANDROID) NOTIMPLEMENTED(); #else - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); if (browser) chrome::ShowSettingsSubPage(browser, chrome::kAutofillSubPage); #endif // #if defined(OS_ANDROID) @@ -78,7 +78,7 @@ void TabAutofillManagerDelegate::ShowPasswordGenerationBubble( #if defined(OS_ANDROID) NOTIMPLEMENTED(); #else - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); browser->window()->ShowPasswordGenerationBubble(bounds, form, generator); #endif // #if defined(OS_ANDROID) } diff --git a/chrome/browser/ui/browser_finder.cc b/chrome/browser/ui/browser_finder.cc index a881f2c..859fb11 100644 --- a/chrome/browser/ui/browser_finder.cc +++ b/chrome/browser/ui/browser_finder.cc @@ -185,6 +185,10 @@ Browser* FindBrowserWithWindow(gfx::NativeWindow window) { return NULL; } +} // namespace browser + +namespace chrome { + Browser* FindBrowserWithWebContents(const WebContents* web_contents) { DCHECK(web_contents); for (TabContentsIterator it; !it.done(); ++it) { @@ -194,10 +198,6 @@ Browser* FindBrowserWithWebContents(const WebContents* web_contents) { return NULL; } -} // namespace browser - -namespace chrome { - Browser* FindLastActiveWithProfile(Profile* profile, HostDesktopType type) { BrowserListImpl* list = BrowserListImpl::GetInstance(type); // We are only interested in last active browsers, so we don't fall back to diff --git a/chrome/browser/ui/browser_finder.h b/chrome/browser/ui/browser_finder.h index 2c55f05..5bc3ffc 100644 --- a/chrome/browser/ui/browser_finder.h +++ b/chrome/browser/ui/browser_finder.h @@ -60,14 +60,14 @@ Browser* FindBrowserWithID(SessionID::id_type desired_id); // Find the browser represented by |window| or NULL if not found. Browser* FindBrowserWithWindow(gfx::NativeWindow window); -// Find the browser containing |web_contents| or NULL if none is found. -// |web_contents| must not be NULL. -Browser* FindBrowserWithWebContents(const content::WebContents* web_contents); - } // namespace browser namespace chrome { +// Find the browser containing |web_contents| or NULL if none is found. +// |web_contents| must not be NULL. +Browser* FindBrowserWithWebContents(const content::WebContents* web_contents); + // Returns the Browser object owned by |profile| on the given desktop type // whose window was most recently active. If no such Browsers exist, returns // NULL. diff --git a/chrome/browser/ui/browser_tab_restore_service_delegate.cc b/chrome/browser/ui/browser_tab_restore_service_delegate.cc index dec8e61..61d56d4 100644 --- a/chrome/browser/ui/browser_tab_restore_service_delegate.cc +++ b/chrome/browser/ui/browser_tab_restore_service_delegate.cc @@ -106,7 +106,7 @@ TabRestoreServiceDelegate* TabRestoreServiceDelegate::Create( TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForWebContents( const WebContents* contents) { - Browser* browser = browser::FindBrowserWithWebContents(contents); + Browser* browser = chrome::FindBrowserWithWebContents(contents); return browser ? browser->tab_restore_service_delegate() : NULL; } diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.mm index 11d1166..a54ee1f 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.mm @@ -64,7 +64,7 @@ gfx::NativeWindow ConstrainedWindowMac2::GetNativeWindow() { } bool ConstrainedWindowMac2::CanShowConstrainedWindow() { - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); if (!browser) return true; return !browser->window()->IsInstantTabShowing(); @@ -73,7 +73,7 @@ bool ConstrainedWindowMac2::CanShowConstrainedWindow() { NSWindow* ConstrainedWindowMac2::GetParentWindow() const { // Tab contents in a tabbed browser may not be inside a window. For this // reason use a browser window if possible. - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); if (browser) return browser->window()->GetNativeWindow(); diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window_mac.mm index 4de3e34..00dd591 100644 --- a/chrome/browser/ui/cocoa/constrained_window_mac.mm +++ b/chrome/browser/ui/cocoa/constrained_window_mac.mm @@ -145,7 +145,7 @@ void ConstrainedWindowMac::CloseConstrainedWindow() { } bool ConstrainedWindowMac::CanShowConstrainedWindow() { - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); if (!browser) return true; return !browser->window()->IsInstantTabShowing(); diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm index 4010e9e..3cd4bff 100644 --- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm @@ -150,7 +150,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver, extensions::ExtensionHost* extensionHost = delegate_->AsExtensionInfoBarDelegate()->extension_host(); Browser* browser = - browser::FindBrowserWithWebContents(owner->GetWebContents()); + chrome::FindBrowserWithWebContents(owner->GetWebContents()); contextMenu_.reset([[ExtensionActionContextMenu alloc] initWithExtension:extensionHost->extension() browser:browser diff --git a/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm b/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm index db02f53..f422c2a 100644 --- a/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm +++ b/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm @@ -101,7 +101,7 @@ return; } - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( picker_->web_contents()); webContents_.reset(picker_->delegate()->CreateWebContentsForInlineDisposition( browser->profile(), url)); diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm index 7bca0f3..371de8f 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm @@ -104,7 +104,7 @@ bool LocationIconDecoration::OnMousePressed(NSRect frame) { NOTREACHED(); return true; } - Browser* browser = browser::FindBrowserWithWebContents(tab); + Browser* browser = chrome::FindBrowserWithWebContents(tab); chrome::ShowPageInfo(browser, tab, nav_entry->GetURL(), nav_entry->GetSSL(), true); return true; diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index c1f5744..5c907b4 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -304,7 +304,7 @@ CreateWebApplicationShortcutsDialogGtk::CreateWebApplicationShortcutsDialogGtk( } void CreateWebApplicationShortcutsDialogGtk::OnCreatedShortcut() { - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); if (browser) chrome::ConvertTabToAppWindow(browser, web_contents_); } diff --git a/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc b/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc index 0818a2e..15edaf3 100644 --- a/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc @@ -147,7 +147,7 @@ void PasswordGenerationBubbleGtk::OnPasswordEdited(GtkWidget* widget) { void PasswordGenerationBubbleGtk::OnLearnMoreLinkClicked(GtkButton* button) { actions_.learn_more_visited = true; - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); content::OpenURLParams params( GURL(chrome::kAutoPasswordGenerationLearnMoreURL), content::Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false); diff --git a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc index 8c1f353..c712723 100644 --- a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc @@ -186,7 +186,7 @@ void SpeechRecognitionBubbleGtk::Show() { target_rect.x() > container_rect.width() || target_rect.y() > container_rect.height()) { // Target is not in screen view, so point to wrench. - Browser* browser = browser::FindBrowserWithWebContents(GetWebContents()); + Browser* browser = chrome::FindBrowserWithWebContents(GetWebContents()); BrowserWindowGtk* browser_window = BrowserWindowGtk::GetBrowserWindowForNativeWindow( browser->window()->GetNativeWindow()); diff --git a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc index f81ad2b..ea81274 100644 --- a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc +++ b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc @@ -296,7 +296,7 @@ void WebIntentPickerGtk::OnInlineDisposition(const string16&, inline_disposition_web_contents_.reset( delegate_->CreateWebContentsForInlineDisposition( tab_contents_->profile(), url)); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( tab_contents_->web_contents()); inline_disposition_delegate_.reset( new WebIntentInlineDispositionDelegate( diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc index 707921e..8ac7457 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc @@ -556,7 +556,7 @@ void WebIntentPickerController::OnSendReturnMessage( if (service_tab_ && reply_type != webkit_glue::WEB_INTENT_SERVICE_CONTENTS_CLOSED) { - Browser* browser = browser::FindBrowserWithWebContents(service_tab_); + Browser* browser = chrome::FindBrowserWithWebContents(service_tab_); if (browser) { int index = browser->tab_strip_model()->GetIndexOfWebContents( service_tab_); @@ -565,7 +565,7 @@ void WebIntentPickerController::OnSendReturnMessage( // Activate source tab. Browser* source_browser = - browser::FindBrowserWithWebContents(web_contents_); + chrome::FindBrowserWithWebContents(web_contents_); if (source_browser) { int source_index = source_browser->tab_strip_model()-> GetIndexOfWebContents(web_contents_); @@ -807,13 +807,13 @@ void WebIntentPickerController::LocationBarPickerButtonClicked() { DCHECK(web_contents_); if (window_disposition_source_ && source_intents_dispatcher_) { Browser* service_browser = - browser::FindBrowserWithWebContents(web_contents_); + chrome::FindBrowserWithWebContents(web_contents_); if (!service_browser) return; TabContents* client_tab = TabContents::FromWebContents(window_disposition_source_); Browser* client_browser = - browser::FindBrowserWithWebContents(window_disposition_source_); + chrome::FindBrowserWithWebContents(window_disposition_source_); if (!client_browser || !client_tab) return; int client_index = client_browser->tab_strip_model()->GetIndexOfTabContents(client_tab); diff --git a/chrome/browser/ui/pdf/pdf_tab_helper.cc b/chrome/browser/ui/pdf/pdf_tab_helper.cc index 1802b40..f617eae 100644 --- a/chrome/browser/ui/pdf/pdf_tab_helper.cc +++ b/chrome/browser/ui/pdf/pdf_tab_helper.cc @@ -49,7 +49,7 @@ void PDFTabHelper::DidNavigateMainFrame( } void PDFTabHelper::UpdateLocationBar() { - Browser* browser = browser::FindBrowserWithWebContents(web_contents()); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); if (!browser) return; diff --git a/chrome/browser/ui/search/other_device_menu_controller.cc b/chrome/browser/ui/search/other_device_menu_controller.cc index c6dfa1f..fe88f6b 100644 --- a/chrome/browser/ui/search/other_device_menu_controller.cc +++ b/chrome/browser/ui/search/other_device_menu_controller.cc @@ -101,7 +101,7 @@ OtherDeviceMenuController::~OtherDeviceMenuController() { void OtherDeviceMenuController::ShowMenu() { content::WebContents* web_contents = web_ui_->GetWebContents(); - Browser* browser = browser::FindBrowserWithWebContents(web_contents); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents); if (!browser) return; diff --git a/chrome/browser/ui/startup/default_browser_prompt_win.cc b/chrome/browser/ui/startup/default_browser_prompt_win.cc index ea9e80e..a7bb1d9a 100644 --- a/chrome/browser/ui/startup/default_browser_prompt_win.cc +++ b/chrome/browser/ui/startup/default_browser_prompt_win.cc @@ -54,7 +54,7 @@ void SetMetroBrowserFlowLauncher::Observe( const content::NotificationSource& source, const content::NotificationDetails& details) { DCHECK_EQ(type, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( content::Source<content::WebContents>(source).ptr()); if (!browser || !browser->is_type_tabbed()) diff --git a/chrome/browser/ui/startup/session_crashed_prompt.cc b/chrome/browser/ui/startup/session_crashed_prompt.cc index 6467eda..9a33df2 100644 --- a/chrome/browser/ui/startup/session_crashed_prompt.cc +++ b/chrome/browser/ui/startup/session_crashed_prompt.cc @@ -60,7 +60,7 @@ SessionCrashedInfoBarDelegate::SessionCrashedInfoBarDelegate( : ConfirmInfoBarDelegate(infobar_helper), accepted_(false), removed_notification_received_(false), - browser_(browser::FindBrowserWithWebContents(owner()->GetWebContents())) { + browser_(chrome::FindBrowserWithWebContents(owner()->GetWebContents())) { // TODO(pkasting,marja): Once InfoBars own they delegates, this is not needed // any more. Then we can rely on delegates getting destroyed, and we can // initiate the session storage scavenging only in the destructor. (Currently, diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index ac9597e..b27b27b 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -290,9 +290,9 @@ bool OneClickInfoBarDelegateImpl::Accept() { // this profile. DisableOneClickSignIn(); content::WebContents* web_contents = owner()->GetWebContents(); - Browser* browser = browser::FindBrowserWithWebContents(web_contents); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents); RecordHistogramAction(one_click_signin::HISTOGRAM_ACCEPTED); - browser::FindBrowserWithWebContents(web_contents)->window()-> + chrome::FindBrowserWithWebContents(web_contents)->window()-> ShowOneClickSigninBubble(base::Bind(&StartSync, browser, OneClickSigninHelper::NO_AUTO_ACCEPT, session_index_, email_, password_)); @@ -705,7 +705,7 @@ void OneClickSigninHelper::DidStopLoading( return; content::WebContents* contents = web_contents(); - Browser* browser = browser::FindBrowserWithWebContents(contents); + Browser* browser = chrome::FindBrowserWithWebContents(contents); InfoBarTabHelper* infobar_tab_helper = InfoBarTabHelper::FromWebContents(contents); diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 581f230a..6b63f21 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -432,7 +432,7 @@ bool CreateUrlApplicationShortcutView::Accept() { SetAppIcon(shortcut_info_.favicon.IsEmpty() ? SkBitmap() : *shortcut_info_.favicon.ToSkBitmap()); - Browser* browser = browser::FindBrowserWithWebContents(web_contents_); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); if (browser) chrome::ConvertTabToAppWindow(browser, web_contents_); return true; diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 49111fb..772be52 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -2783,7 +2783,7 @@ void BrowserView::ActivateAppModalDialog() const { return; Browser* modal_browser = - browser::FindBrowserWithWebContents(active_dialog->web_contents()); + chrome::FindBrowserWithWebContents(active_dialog->web_contents()); if (modal_browser && (browser_ != modal_browser)) { modal_browser->window()->FlashFrame(true); modal_browser->window()->Activate(); diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 9c850d6..ee59f18 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -102,7 +102,7 @@ namespace { Browser* GetBrowserFromDelegate(LocationBarView::Delegate* delegate) { WebContents* contents = delegate->GetWebContents(); - return browser::FindBrowserWithWebContents(contents); + return chrome::FindBrowserWithWebContents(contents); } // Height of the location bar's round corner region. @@ -1226,7 +1226,7 @@ void LocationBarView::RefreshPageActionViews() { } if (!page_action_views_.empty() && contents) { - Browser* browser = browser::FindBrowserWithWebContents(contents); + Browser* browser = chrome::FindBrowserWithWebContents(contents); GURL url = chrome::GetActiveWebContents(browser)->GetURL(); for (PageActionViews::const_iterator i(page_action_views_.begin()); diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index dee417e..f0f519d 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -117,7 +117,7 @@ void SadTabView::LinkClicked(views::Link* source, int event_flags) { web_contents_->OpenURL(params); } else if (source == feedback_link_) { chrome::ShowFeedbackPage( - browser::FindBrowserWithWebContents(web_contents_), + chrome::FindBrowserWithWebContents(web_contents_), l10n_util::GetStringUTF8(IDS_KILLED_TAB_FEEDBACK_MESSAGE), std::string(kCategoryTagCrash)); } diff --git a/chrome/browser/ui/views/speech_recognition_bubble_views.cc b/chrome/browser/ui/views/speech_recognition_bubble_views.cc index d4dbe91..f560ea8 100644 --- a/chrome/browser/ui/views/speech_recognition_bubble_views.cc +++ b/chrome/browser/ui/views/speech_recognition_bubble_views.cc @@ -358,7 +358,7 @@ SpeechRecognitionBubbleImpl::~SpeechRecognitionBubbleImpl() { void SpeechRecognitionBubbleImpl::Show() { if (!bubble_) { // Anchor to the location icon view, in case |element_rect| is offscreen. - Browser* browser = browser::FindBrowserWithWebContents(GetWebContents()); + Browser* browser = chrome::FindBrowserWithWebContents(GetWebContents()); BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); views::View* icon = browser_view->GetLocationBarView() ? browser_view->GetLocationBarView()->location_icon_view() : NULL; diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc index 336a07d..8b3bb8b 100644 --- a/chrome/browser/ui/views/web_intent_picker_views.cc +++ b/chrome/browser/ui/views/web_intent_picker_views.cc @@ -1383,7 +1383,7 @@ void WebIntentPickerViews::OnInlineDisposition( // Does not take ownership, so we keep a scoped_ptr // for the WebContents locally. webview_->SetWebContents(inline_web_contents_.get()); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( tab_contents_->web_contents()); inline_disposition_delegate_.reset( new WebIntentInlineDispositionDelegate(this, inline_web_contents_.get(), diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.cc b/chrome/browser/ui/webui/chrome_web_contents_handler.cc index a52383a..745b908 100644 --- a/chrome/browser/ui/webui/chrome_web_contents_handler.cc +++ b/chrome/browser/ui/webui/chrome_web_contents_handler.cc @@ -40,7 +40,7 @@ WebContents* ChromeWebContentsHandler::OpenURLFromTab( chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; if (source) { - Browser* source_browser = browser::FindBrowserWithWebContents(source); + Browser* source_browser = chrome::FindBrowserWithWebContents(source); if (source_browser) desktop_type = source_browser->host_desktop_type(); } @@ -91,7 +91,7 @@ void ChromeWebContentsHandler::AddNewContents( chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; if (source) { - Browser* source_browser = browser::FindBrowserWithWebContents(source); + Browser* source_browser = chrome::FindBrowserWithWebContents(source); if (source_browser) desktop_type = source_browser->host_desktop_type(); } diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 2c5adff..1ba0698 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -753,7 +753,7 @@ void ExtensionSettingsHandler::HandleOptionsMessage(const ListValue* args) { return; extensions::ExtensionSystem::Get(Profile::FromWebUI(web_ui()))-> process_manager()->OpenOptionsPage(extension, - browser::FindBrowserWithWebContents(web_ui()->GetWebContents())); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents())); } void ExtensionSettingsHandler::HandleShowButtonMessage(const ListValue* args) { @@ -952,7 +952,7 @@ ExtensionUninstallDialog* ExtensionSettingsHandler::GetExtensionUninstallDialog() { #if !defined(OS_ANDROID) if (!extension_uninstall_dialog_.get()) { - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); extension_uninstall_dialog_.reset( ExtensionUninstallDialog::Create(browser, this)); diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index 49d6086..42dee4a 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -301,14 +301,14 @@ void HelpHandler::RelaunchNow(const ListValue* args) { void HelpHandler::OpenFeedbackDialog(const ListValue* args) { DCHECK(args->empty()); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); chrome::OpenFeedbackDialog(browser); } void HelpHandler::OpenHelpPage(const base::ListValue* args) { DCHECK(args->empty()); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); chrome::ShowHelp(browser, chrome::HELP_SOURCE_WEBUI); } diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index ff348ff..5fb4e99 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -280,7 +280,7 @@ void BrowsingHistoryHandler::HandleClearBrowsingData(const ListValue* args) { #else // TODO(beng): This is an improper direct dependency on Browser. Route this // through some sort of delegate. - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); chrome::ShowClearBrowsingDataDialog(browser); #endif diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index b146a15..58575f9 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -512,7 +512,7 @@ void AppLauncherHandler::HandleLaunchApp(const ListValue* args) { // To give a more "launchy" experience when using the NTP launcher, we close // it automatically. - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); WebContents* old_contents = NULL; if (browser) @@ -587,7 +587,7 @@ void AppLauncherHandler::HandleCreateAppShortcut(const ListValue* args) { if (!extension) return; - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); browser->window()->ShowCreateChromeAppShortcutsDialog( browser->profile(), extension); @@ -915,7 +915,7 @@ void AppLauncherHandler::InstallUIAbort(bool user_initiated) { ExtensionUninstallDialog* AppLauncherHandler::GetExtensionUninstallDialog() { if (!extension_uninstall_dialog_.get()) { - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); extension_uninstall_dialog_.reset( ExtensionUninstallDialog::Create(browser, this)); diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc index f1ea172..6022bb9 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc @@ -128,7 +128,7 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) { if (!sync_service_->IsSyncEnabled()) return; Browser* browser = - browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); if (!browser || browser->IsAttemptingToCloseBrowser()) return; chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_NTP_LINK); diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc index 94af9f3..e182bd6 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc @@ -129,7 +129,7 @@ void NTPLoginHandler::HandleShowSyncLoginUI(const ListValue* args) { std::string username = profile->GetPrefs()->GetString( prefs::kGoogleServicesUsername); content::WebContents* web_contents = web_ui()->GetWebContents(); - Browser* browser = browser::FindBrowserWithWebContents(web_contents); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents); if (!browser) return; @@ -186,7 +186,7 @@ void NTPLoginHandler::HandleLoginMessageSeen(const ListValue* args) { void NTPLoginHandler::HandleShowAdvancedLoginUI(const ListValue* args) { Browser* browser = - browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); if (browser) chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_NTP_LINK); } diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index cbe1829..adff348 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -966,7 +966,7 @@ void BrowserOptionsHandler::CreateProfile(const ListValue* args) { bool create_box_checked; Browser* browser = - browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; if (browser) desktop_type = browser->host_desktop_type(); diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index b087b82..31861da 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -401,7 +401,7 @@ void ChangePictureOptionsHandler::Observe( gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const { Browser* browser = - browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); return browser->window()->GetNativeWindow(); } diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index 02b1187..2672e33 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -1509,7 +1509,7 @@ gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const { // TODO(beng): This is an improper direct dependency on Browser. Route this // through some sort of delegate. Browser* browser = - browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); return browser->window()->GetNativeWindow(); } diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc index 94aab5b..b981e15 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.cc +++ b/chrome/browser/ui/webui/options/import_data_handler.cc @@ -119,7 +119,7 @@ void ImportDataHandler::ImportData(const ListValue* args) { #endif importer_host_->SetObserver(this); importer_host_->set_browser( - browser::FindBrowserWithWebContents(web_ui()->GetWebContents())); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents())); Profile* profile = Profile::FromWebUI(web_ui()); importer_host_->StartImportSettings(source_profile, profile, import_services, diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index e2f796f..d878e3a7 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -258,7 +258,7 @@ void ManageProfileHandler::DeleteProfile(const ListValue* args) { return; Browser* browser = - browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; if (browser) desktop_type = browser->host_desktop_type(); diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc index d685dc8..1920da4 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc @@ -193,7 +193,7 @@ void SyncPromoHandler::HandleCloseSyncPromo(const base::ListValue* args) { // another URL. This prevents the browser window from flashing during // close. Browser* browser = - browser::FindBrowserWithWebContents(web_ui()->GetWebContents()); + chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); if (!browser || !browser->IsAttemptingToCloseBrowser()) { // Close the window if it was opened in auto-close mode. const GURL& sync_url = web_ui()->GetWebContents()->GetURL(); diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index fe2f841..4d60906 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -568,7 +568,7 @@ void SyncSetupHandler::DisplayGaiaLogin(bool fatal_error) { if (UseWebBasedSigninFlow()) { GURL url(SyncPromoUI::GetSyncPromoURL(GURL(), SyncPromoUI::SOURCE_SETTINGS, false)); - Browser* browser = browser::FindBrowserWithWebContents( + Browser* browser = chrome::FindBrowserWithWebContents( web_ui()->GetWebContents()); browser->OpenURL( content::OpenURLParams(url, content::Referrer(), SINGLETON_TAB, |