| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index 2a039be8705239dee42cf3afbdd733aeb82aa7fd..4e4ceac5edfb9e0aff542161fa19fa39275282cb 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -553,12 +553,6 @@ bool BrowserView::IsRegularOrGuestSession() const {
|
| return profiles::IsRegularOrGuestSession(browser_.get());
|
| }
|
|
|
| -int BrowserView::GetOTRIconResourceID() const {
|
| - if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH && IsFullscreen())
|
| - return IDR_OTR_ICON_FULLSCREEN;
|
| - return IDR_OTR_ICON;
|
| -}
|
| -
|
| bool BrowserView::ShouldShowAvatar() const {
|
| #if defined(OS_CHROMEOS)
|
| if (!browser_->is_type_tabbed() && !browser_->is_app())
|
| @@ -619,7 +613,7 @@ WebContents* BrowserView::GetActiveWebContents() const {
|
| }
|
|
|
| gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
|
| - return *GetThemeProvider()->GetImageSkiaNamed(GetOTRIconResourceID());
|
| + return *GetThemeProvider()->GetImageSkiaNamed(IDR_OTR_ICON);
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|