third_party/WebKit/Source/web/ColorChooserUIController.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

Side by Side Diff

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

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

Side by Side Diff: third_party/WebKit/Source/web/ColorChooserUIController.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

Patch Set: Rebasing... Created 4 years ago

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

Jump to:

View unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 if (m_client)	80 if (m_client)

81 m_client->didEndChooser();	81 m_client->didEndChooser();

82 }	82 }

83	83

84 void ColorChooserUIController::openColorChooser() {	84 void ColorChooserUIController::openColorChooser() {

85 DCHECK(!m_chooser);	85 DCHECK(!m_chooser);

86 WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(m_frame);	86 WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(m_frame);

87 WebFrameClient* webFrameClient = frame->client();	87 WebFrameClient* webFrameClient = frame->client();

88 if (!webFrameClient)	88 if (!webFrameClient)

89 return;	89 return;

90 m_chooser = wrapUnique(webFrameClient->createColorChooser(	90 m_chooser = WTF::wrapUnique(webFrameClient->createColorChooser(

91 this, static_cast<WebColor>(m_client->currentColor().rgb()),	91 this, static_cast<WebColor>(m_client->currentColor().rgb()),

92 m_client->suggestions()));	92 m_client->suggestions()));

93 }	93 }

94	94

95 } // namespace blink	95 } // namespace blink

OLD	NEW

« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.cpp ('k') | third_party/WebKit/Source/web/CompositorMutatorImpl.cpp » ('j') | no next file with comments »