Skip to content

Commit

Permalink
Remove UI_DEVTOOLS_EXPORT from class and add it to static methods
Browse files Browse the repository at this point in the history
The error was caused because static methods in devtools_server.h were
not marked UI_DEVTOOLS_EXPORT. We cannot mark them as such if the whole
class is already marked. Therefore, we need to remove the export from the
class and add it to the static methods.

BUG=669352

Review-Url: https://codereview.chromium.org/2560013002
Cr-Commit-Position: refs/heads/master@{#437338}
  • Loading branch information
mhashmi authored and Commit bot committed Dec 8, 2016
1 parent bee3d3b commit c9d4abe
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions components/ui_devtools/devtools_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,18 @@
namespace ui {
namespace devtools {

class UI_DEVTOOLS_EXPORT UiDevToolsServer
: public NON_EXPORTED_BASE(net::HttpServer::Delegate) {
class UiDevToolsServer : public net::HttpServer::Delegate {
public:
~UiDevToolsServer() override;

// Returns an empty unique_ptr if ui devtools flag isn't enabled or if a
// server instance has already been created.
static std::unique_ptr<UiDevToolsServer> Create(
static UI_DEVTOOLS_EXPORT std::unique_ptr<UiDevToolsServer> Create(
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner);

// Returns a list of attached UiDevToolsClient name + URL
using NameUrlPair = std::pair<std::string, std::string>;
static std::vector<NameUrlPair> GetClientNamesAndUrls();
static UI_DEVTOOLS_EXPORT std::vector<NameUrlPair> GetClientNamesAndUrls();

void AttachClient(std::unique_ptr<UiDevToolsClient> client);
void SendOverWebSocket(int connection_id, const String& message);
Expand Down

0 comments on commit c9d4abe

Please sign in to comment.