Merge 144001 - Update BrowserView::ProcessFullscreen OmniboxViewWin use; etc.

chrome/browser/ui/views/location_bar/location_bar_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/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
-#include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/chrome_to_mobile_service.h"
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 33 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
-#include "ui/base/ui_base_switches.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/label.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/first_run_bubble.h"
 #endif
 
 using content::WebContents;
 using views::View;
 
 namespace {
 
 WebContents* GetWebContentsFromDelegate(LocationBarView::Delegate* delegate) {
   const TabContents* tab_contents = delegate->GetTabContents();
   return tab_contents ? tab_contents->web_contents() : NULL;
 }
 
-bool UseOmniboxViews() {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  static bool kUseOmniboxViews = CommandLine::ForCurrentProcess()->
-                                     HasSwitch(switches::kEnableViewsTextfield);
-  return kUseOmniboxViews;
-#endif
-  return true;
-}
-
-// Return |view| as an OmniboxViewViews, or NULL if it is of a different type.
-OmniboxViewViews* GetOmniboxViewViews(OmniboxView* view) {
-  return UseOmniboxViews() ? static_cast<OmniboxViewViews*>(view) : NULL;
-}
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-// Return |view| as an OmniboxViewWin, or NULL if it is of a different type.
-OmniboxViewWin* GetOmniboxViewWin(OmniboxView* view) {
-  return UseOmniboxViews() ? NULL : static_cast<OmniboxViewWin*>(view);
-}
-#endif
-
 // Height of the location bar's round corner region.
 const int kBorderRoundCornerHeight = 5;
 // Width of location bar's round corner region.
 const int kBorderRoundCornerWidth = 4;
 // Radius of the round corners inside the location bar.
 const int kBorderCornerRadius = 2;
 
 const int kDesktopItemPadding = 3;
 const int kDesktopEdgeItemPadding = kDesktopItemPadding;
 
@@ skipping 1245 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }