Merge apps/pref* to extensions/browser/pref*

apps/app_window.cc

 // Copyright 2014 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 "apps/app_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/draggable_region.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/gfx/screen.h"
 
 #if !defined(OS_MACOSX)
-#include "apps/pref_names.h"
 #include "base/prefs/pref_service.h"
+#include "extensions/browser/pref_names.h"
 #endif
 
 using content::BrowserContext;
 using content::ConsoleMessageLevel;
 using content::WebContents;
 using extensions::APIPermission;
 using extensions::NativeAppWindow;
 using web_modal::WebContentsModalDialogHost;
 using web_modal::WebContentsModalDialogManager;
 
@@ skipping 522 matching lines @@
 
   if (enable) {
 #if !defined(OS_MACOSX)
     // Do not enter fullscreen mode if disallowed by pref.
     // TODO(bartfab): Add a test once it becomes possible to simulate a user
     // gesture. http://crbug.com/174178
     if (type != FULLSCREEN_TYPE_FORCED) {
       PrefService* prefs =
           extensions::ExtensionsBrowserClient::Get()->GetPrefServiceForContext(
               browser_context());
-      if (!prefs->GetBoolean(prefs::kAppFullscreenAllowed))
+      if (!prefs->GetBoolean(extensions::pref_names::kAppFullscreenAllowed))
         return;
     }
 #endif
     fullscreen_types_ |= type;
   } else {
     fullscreen_types_ &= ~type;
   }
   SetNativeWindowFullscreen();
 }
 
@@ skipping 484 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace apps