| Index: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
|
| diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
|
| index b8ccbd8fbbaff98432cb699efaba80a3df5a7d9d..edc2849cb0c97bb18f8140bb90177b8cd4acc7a7 100644
|
| --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
|
| +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
|
| @@ -5,10 +5,10 @@
|
| #include "chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h"
|
|
|
| #include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h"
|
| -#include "chrome/browser/ui/sad_tab_helper.h"
|
| #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
|
| #include "chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h"
|
| -#include "chrome/browser/ui/views/sad_tab_view.h"
|
| +#include "components/sad_tab/sad_tab_helper.h"
|
| +#include "components/sad_tab/views/sad_tab_view.h"
|
| #include "components/web_modal/popup_manager.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| @@ -48,9 +48,11 @@ content::WebDragDestDelegate*
|
| }
|
|
|
| bool ChromeWebContentsViewDelegateViews::Focus() {
|
| - SadTabHelper* sad_tab_helper = SadTabHelper::FromWebContents(web_contents_);
|
| + sad_tab::SadTabHelper* sad_tab_helper =
|
| + sad_tab::SadTabHelper::FromWebContents(web_contents_);
|
| if (sad_tab_helper) {
|
| - SadTabView* sad_tab = static_cast<SadTabView*>(sad_tab_helper->sad_tab());
|
| + sad_tab::SadTabView* sad_tab =
|
| + static_cast<sad_tab::SadTabView*>(sad_tab_helper->sad_tab());
|
| if (sad_tab) {
|
| sad_tab->RequestFocus();
|
| return true;
|
| @@ -167,10 +169,12 @@ void ChromeWebContentsViewDelegateViews::ShowContextMenu(
|
| }
|
|
|
| void ChromeWebContentsViewDelegateViews::SizeChanged(const gfx::Size& size) {
|
| - SadTabHelper* sad_tab_helper = SadTabHelper::FromWebContents(web_contents_);
|
| + sad_tab::SadTabHelper* sad_tab_helper =
|
| + sad_tab::SadTabHelper::FromWebContents(web_contents_);
|
| if (!sad_tab_helper)
|
| return;
|
| - SadTabView* sad_tab = static_cast<SadTabView*>(sad_tab_helper->sad_tab());
|
| + sad_tab::SadTabView* sad_tab =
|
| + static_cast<sad_tab::SadTabView*>(sad_tab_helper->sad_tab());
|
| if (sad_tab)
|
| sad_tab->GetWidget()->SetBounds(gfx::Rect(size));
|
| }
|
|
|