chrome/browser/prefs/browser_prefs.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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: chrome/browser/prefs/browser_prefs.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 1aa3c9e9f91411362a74d4326c2097082ed05ed3..a90aed0f1542cc5f4b6663615531d85e5f95e205 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -56,8 +56,8 @@

#include "chrome/browser/upgrade_detector.h"

#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port

-#include "chrome/browser/views/browser_actions_container.h"

-#include "chrome/browser/views/frame/browser_view.h"

+#include "chrome/browser/ui/views/browser_actions_container.h"

+#include "chrome/browser/ui/views/frame/browser_view.h"

#endif

#if defined(TOOLKIT_GTK)