chrome/browser/ui/cocoa/browser_window_controller_private.mm - Issue 7600013: ntp4: make default

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/ui/cocoa/browser_window_controller_private.mm

Issue 7600013: ntp4: make default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit test failures Created 9 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: chrome/browser/ui/cocoa/browser_window_controller_private.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm

index d7b2c848d4f58ef27ed3f87904fcc9b07a1c794a..f73571d70d36a005bf28de39d9762325e6cb24a7 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm

@@ -30,7 +30,6 @@

#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"

#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

-#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "content/browser/renderer_host/render_widget_host_view.h"

#include "content/browser/tab_contents/tab_contents.h"

@@ -545,7 +544,7 @@ willPositionSheet:(NSWindow*)sheet

- (BOOL)shouldShowDetachedBookmarkBar {

// NTP4 never detaches the bookmark bar.

- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))

+ if (NewTabUI::Ntp4Enabled())

return NO;

DCHECK(browser_.get());