Source/web/ColorChooserPopupUIController.cpp - Issue 462353003: Cleanup namespace usage in Source/web[A-V]*.cpp

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: Source/web/ColorChooserPopupUIController.cpp

Issue 462353003: Cleanup namespace usage in Source/web[A-V]*.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Minor updates 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/web/ColorChooserPopupUIController.cpp

diff --git a/Source/web/ColorChooserPopupUIController.cpp b/Source/web/ColorChooserPopupUIController.cpp

index 3e6b2fd6a39addb06e0e3aa0b01f799d34ec512a..775d7ca8478912a8acd635d5a97c40dc8b320388 100644

--- a/Source/web/ColorChooserPopupUIController.cpp

+++ b/Source/web/ColorChooserPopupUIController.cpp

@@ -34,8 +34,6 @@

#include "web/ChromeClientImpl.h"

#include "web/WebViewImpl.h"

-using namespace blink;

namespace blink {

// Keep in sync with Actions in colorSuggestionPicker.js.

@@ -45,7 +43,7 @@ enum ColorPickerPopupAction {

ColorPickerPopupActionSetValue = 0

};

-ColorChooserPopupUIController::ColorChooserPopupUIController(blink::LocalFrame* frame, ChromeClientImpl* chromeClient, ColorChooserClient* client)

+ColorChooserPopupUIController::ColorChooserPopupUIController(LocalFrame* frame, ChromeClientImpl* chromeClient, ColorChooserClient* client)

: ColorChooserUIController(frame, client)

, m_chromeClient(chromeClient)

, m_client(client)

@@ -88,16 +86,16 @@ void ColorChooserPopupUIController::writeDocument(SharedBuffer* data)

IntRect anchorRectInScreen = m_chromeClient->rootViewToScreen(m_client->elementRectRelativeToRootView());

PagePopupClient::addString("<!DOCTYPE html><head><meta charset='UTF-8'><style>\n", data);

- data->append(blink::Platform::current()->loadResource("pickerCommon.css"));

- data->append(blink::Platform::current()->loadResource("colorSuggestionPicker.css"));

+ data->append(Platform::current()->loadResource("pickerCommon.css"));

+ data->append(Platform::current()->loadResource("colorSuggestionPicker.css"));

PagePopupClient::addString("</style></head><body><div id=main>Loading...</div><script>\n"

"window.dialogArguments = {\n", data);

PagePopupClient::addProperty("values", suggestionValues, data);

PagePopupClient::addProperty("otherColorLabel", locale().queryString(WebLocalizedString::OtherColorLabel), data);

addProperty("anchorRectInScreen", anchorRectInScreen, data);

PagePopupClient::addString("};\n", data);

- data->append(blink::Platform::current()->loadResource("pickerCommon.js"));

- data->append(blink::Platform::current()->loadResource("colorSuggestionPicker.js"));

+ data->append(Platform::current()->loadResource("pickerCommon.js"));

+ data->append(Platform::current()->loadResource("colorSuggestionPicker.js"));

PagePopupClient::addString("</script></body>\n", data);

}

@@ -148,4 +146,4 @@ void ColorChooserPopupUIController::closePopup()

m_chromeClient->closePagePopup(m_popup);

}

+} // namespace blink

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