diff options
Diffstat (limited to 'chrome/browser/ui/views')
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_view.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/views/select_file_dialog_extension.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/views/wrench_menu.cc | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index f910da3..46cc290 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1532,8 +1532,7 @@ bool BrowserView::ShouldShowWindowTitle() const { gfx::ImageSkia BrowserView::GetWindowAppIcon() { if (browser_->is_app()) { - WebContents* contents = - browser_->tab_strip_model()->GetActiveWebContents(); + WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents(); extensions::TabHelper* extensions_tab_helper = contents ? extensions::TabHelper::FromWebContents(contents) : NULL; if (extensions_tab_helper && extensions_tab_helper->GetExtensionAppIcon()) @@ -2545,8 +2544,7 @@ void BrowserView::DoCutCopyPaste(void (content::RenderWidgetHost::*method)(), int windows_msg_id, #endif int command_id) { - WebContents* contents = - browser_->tab_strip_model()->GetActiveWebContents(); + WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents(); if (!contents) return; if (DoCutCopyPasteForWebContents(contents, method)) diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc index 7c21687..630e7de 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension.cc @@ -24,12 +24,12 @@ #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_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/browser/ui/extensions/native_app_window.h" #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/browser/ui/host_desktop.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/extensions/extension_dialog.h" #include "content/public/browser/browser_thread.h" #include "ui/shell_dialogs/selected_file_info.h" @@ -270,7 +270,7 @@ void SelectFileDialogExtension::SelectFileImpl( chrome::FindLastActiveWithHostDesktopType(chrome::GetActiveDesktop()); if (owner_browser) { base_window = owner_browser->window(); - web_contents = chrome::GetActiveWebContents(owner_browser); + web_contents = owner_browser->tab_strip_model()->GetActiveWebContents(); profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext()); } else if (owner_window) { // If an owner_window was supplied but we couldn't find a browser, this diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index b64513c..c7b65df 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -15,10 +15,10 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/search/search.h" #include "chrome/browser/ui/search/search_model.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/host_zoom_map.h" @@ -625,7 +625,8 @@ class WrenchMenu::ZoomView : public WrenchMenuView, void UpdateZoomControls() { bool enable_increment = false; bool enable_decrement = false; - WebContents* selected_tab = chrome::GetActiveWebContents(menu_->browser_); + WebContents* selected_tab = + menu_->browser_->tab_strip_model()->GetActiveWebContents(); int zoom = 100; if (selected_tab) zoom = selected_tab->GetZoomPercent(&enable_increment, &enable_decrement); @@ -645,7 +646,8 @@ class WrenchMenu::ZoomView : public WrenchMenuView, int max_w = 0; - WebContents* selected_tab = chrome::GetActiveWebContents(menu_->browser_); + WebContents* selected_tab = + menu_->browser_->tab_strip_model()->GetActiveWebContents(); if (selected_tab) { int min_percent = selected_tab->GetMinimumZoomPercent(); int max_percent = selected_tab->GetMaximumZoomPercent(); |