chrome/browser/ui/cocoa/web_intent_sheet_controller.mm - Issue 10540022: mac: Plumbing for the emoji font.

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/web_intent_sheet_controller.mm

Issue 10540022: mac: Plumbing for the emoji font. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments falken Created 8 years, 2 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/web_intent_sheet_controller.mm

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

index 82aa558d552c5563af5465750f66e5c5162ecd91..fa44c64d506710a817b5bebd7f8ccc7d9faed4cf 100644

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

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

@@ -1107,7 +1107,7 @@ const CGFloat kAddButtonWidth = 128.0;

!model_->GetInstalledServiceCount() &&

!model_->GetSuggestedExtensionCount();

- if (model_ && model_->IsWaitingForSuggestions()) {

+ if (model_) {// && model_->IsWaitingForSuggestions()) {

falken 2012/10/05 05:40:47 I think we can't have commented out code, right?

Nico 2012/10/05 05:41:34 Whoops, that's unrelated anyway. Reverted this fil

if (!waitingView_.get())

waitingView_.reset([[WaitingView alloc] init]);

[subviews addObject:waitingView_];