Revert 148511 - Add pin icon to the omnibar in windows 8 metro mode.

chrome/browser/ui/views/frame/browser_view.cc

 // 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/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window_state.h"
-#include "chrome/browser/ui/metro_pin_tab_helper.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h"
@@ skipping 883 matching lines @@
 }
 
 void BrowserView::UpdateReloadStopState(bool is_loading, bool force) {
   toolbar_->reload_button()->ChangeMode(
       is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, force);
 }
 
 void BrowserView::UpdateToolbar(TabContents* contents,
                                 bool should_restore_state) {
   toolbar_->Update(contents->web_contents(), should_restore_state);
-  GetLocationBarView()->SetMetroPinnedState(
-      contents->metro_pin_tab_helper()->is_pinned());
 }
 
 void BrowserView::FocusToolbar() {
   // Start the traversal within the main toolbar. SetPaneFocus stores
   // the current focused view before changing focus.
   toolbar_->SetPaneFocus(NULL);
 }
 
 void BrowserView::FocusBookmarksToolbar() {
   if (active_bookmark_bar_ && bookmark_bar_view_->visible())
@@ skipping 450 matching lines @@
   return contents_container_;
 }
 
 ToolbarView* BrowserView::GetToolbarView() const {
   return toolbar_;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, TabStripModelObserver implementation:
 
-void BrowserView::TabInsertedAt(TabContents* contents,
-                                int index,
-                                bool foreground) {
-  contents->metro_pin_tab_helper()->set_observer(this);
-}
-
 void BrowserView::TabDetachedAt(TabContents* contents, int index) {
-  contents->metro_pin_tab_helper()->set_observer(NULL);
   // We use index here rather than comparing |contents| because by this time
   // the model has already removed |contents| from its list, so
   // browser_->GetActiveWebContents() will return NULL or something else.
   if (index == browser_->active_index()) {
     // We need to reset the current tab contents to NULL before it gets
     // freed. This is because the focus manager performs some operations
     // on the selected WebContents when it is removed.
     contents_container_->SetWebContents(NULL);
     infobar_container_->ChangeTabContents(NULL);
     UpdateDevToolsForContents(NULL);
@@ skipping 16 matching lines @@
                                    TabContents* new_contents,
                                    int index,
                                    bool user_gesture) {
   ProcessTabSelected(new_contents);
 }
 
 void BrowserView::TabReplacedAt(TabStripModel* tab_strip_model,
                                 TabContents* old_contents,
                                 TabContents* new_contents,
                                 int index) {
-  new_contents->metro_pin_tab_helper()->set_observer(this);
-
   if (index != browser_->tab_strip_model()->active_index())
     return;
 
   if (contents_->preview_web_contents() == new_contents->web_contents()) {
     // If 'preview' is becoming active, swap the 'active' and 'preview' and
     // delete what was the active.
     contents_->MakePreviewContentsActiveContents();
     views::WebView* old_container = contents_container_;
     contents_container_ = preview_container_;
     old_container->SetWebContents(NULL);
@@ skipping 403 matching lines @@
     sender->child_at(i)->InvalidateLayout();
   SchedulePaint();
   Layout();
   return false;
 }
 
 void BrowserView::OnSysColorChange() {
   browser::MaybeShowInvertBubbleView(browser_.get(), contents_);
 }
 
-void BrowserView::MetroPinnedStateChanged(content::WebContents* contents,
-                                          bool is_pinned) {
-  if (contents == chrome::GetActiveWebContents(browser()))
-    GetLocationBarView()->SetMetroPinnedState(is_pinned);
-}
-
 int BrowserView::GetOTRIconResourceID() const {
   int otr_resource_id = IDR_OTR_ICON;
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     if (IsFullscreen())
       otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
 #if defined(OS_WIN) && !defined(USE_AURA)
     if (base::win::IsMetroProcess())
       otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
 #endif
   }
@@ skipping 699 matching lines @@
   if (contents && contents->GetContentNativeView() &&
       contents->GetContentNativeView()->HasFocus()) {
     (contents->GetRenderViewHost()->*method)();
     return true;
   }
 #elif defined(OS_WIN)
   // TODO(yusukes): Support non-Aura Windows.
 #endif
   return false;
 }