apps/app_window.cc - Issue 493003002: Merge apps/pref* to extensions/browser/pref*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: apps/app_window.cc

Issue 493003002: Merge apps/pref* to extensions/browser/pref* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix GN Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: apps/app_window.cc

diff --git a/apps/app_window.cc b/apps/app_window.cc

index 14bf43805d408d45ff263201c0d193f73d08ca5b..459e4c49f69d36be98b18ac282f23c2eaa682b36 100644

--- a/apps/app_window.cc

+++ b/apps/app_window.cc

@@ -49,8 +49,8 @@

#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;

@@ -593,7 +593,7 @@ void AppWindow::SetFullscreen(FullscreenType type, bool enable) {

PrefService* prefs =

extensions::ExtensionsBrowserClient::Get()->GetPrefServiceForContext(

browser_context());

- if (!prefs->GetBoolean(prefs::kAppFullscreenAllowed))

+ if (!prefs->GetBoolean(extensions::pref_names::kAppFullscreenAllowed))

return;

}

#endif

« no previous file with comments | « apps/BUILD.gn ('k') | apps/apps.gypi » ('j') | no next file with comments »