Changed static variable flag to be a bool in the anon namespace.

ui/app_list/views/search_box_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 "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 35 matching lines @@
 const int kInnerPadding = 24;
 const int kPreferredWidth = 360;
 const int kPreferredWidthFullscreen = 544;
 const int kPreferredHeight = 48;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 const int kBackgroundBorderCornerRadius = 2;
 const int kBackgroundBorderCornerRadiusFullscreen = 20;
 
-bool IsFullscreenAppListEnabled() {
+// The switch that is checked to determine if the fullscreen app list feature is
+// enabled.
+bool is_fullscreen_app_list_enabled;
+
+void IsFullscreenAppListEnabled() {
   // Cache this value to avoid repeated lookup.
-  static bool cached_value = features::IsFullscreenAppListEnabled();
-  return cached_value;
+  is_fullscreen_app_list_enabled = features::IsFullscreenAppListEnabled();
 }
 
 // A background that paints a solid white rounded rect with a thin grey border.
 class SearchBoxBackground : public views::Background {
  public:
   SearchBoxBackground()
       : background_border_corner_radius_(
-            IsFullscreenAppListEnabled()
+            is_fullscreen_app_list_enabled
                 ? kBackgroundBorderCornerRadiusFullscreen
                 : kBackgroundBorderCornerRadius) {}
   ~SearchBoxBackground() override {}
 
  private:
   // views::Background overrides:
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
     gfx::Rect bounds = view->GetContentsBounds();
 
     cc::PaintFlags flags;
@@ skipping 58 matching lines @@
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
       content_container_(new views::View),
       back_button_(NULL),
       speech_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL),
       app_list_view_(app_list_view),
       focused_view_(FOCUS_SEARCH_BOX) {
+  IsFullscreenAppListEnabled();
   SetLayoutManager(new views::FillLayout);
-  SetPreferredSize(gfx::Size(IsFullscreenAppListEnabled()
+  SetPreferredSize(gfx::Size(is_fullscreen_app_list_enabled
                                  ? kPreferredWidthFullscreen
                                  : kPreferredWidth,
                              kPreferredHeight));
   AddChildView(content_container_);
 
   SetShadow(GetShadowForZHeight(2));
   back_button_ = new SearchBoxImageButton(this);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   back_button_->SetImage(views::ImageButton::STATE_NORMAL,
                          rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
@@ skipping 181 matching lines @@
   DCHECK(delegate_);
   delegate_->QueryChanged(this);
 }
 
 void SearchBoxView::ContentsChanged(views::Textfield* sender,
                                     const base::string16& new_contents) {
   UpdateModel();
   view_delegate_->AutoLaunchCanceled();
   NotifyQueryChanged();
 
-  if (IsFullscreenAppListEnabled() && !app_list_view_->is_fullscreen()) {
+  if (is_fullscreen_app_list_enabled && !app_list_view_->is_fullscreen()) {
     // If the app list is in the peeking state, switch it to fullscreen.
     app_list_view_->SetState(AppListView::FULLSCREEN);
   }
 }
 
 bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
                                    const ui::KeyEvent& key_event) {
   if (key_event.type() == ui::ET_KEY_PRESSED) {
     if (key_event.key_code() == ui::VKEY_TAB &&
         focused_view_ != FOCUS_CONTENTS_VIEW &&
@@ skipping 98 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list