Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2466)

Unified Diff: chrome/browser/devtools/chrome_devtools_manager_delegate.cc

Issue 1569893003: Add "Request app banner" context menu in DevTools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android support Created 4 years, 11 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: chrome/browser/devtools/chrome_devtools_manager_delegate.cc
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index 7cfc9c37824bf5460b8a3d6a418bcd10f23c85a9..5c5d8bf7aa994c5b3ae6311f5d8a5d3fed778382 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -6,13 +6,41 @@
#include "build/build_config.h"
#include "chrome/browser/devtools/devtools_network_protocol_handler.h"
+#include "chrome/browser/devtools/devtools_protocol_constants.h"
+#include "chrome/browser/ui/tab_contents/core_tab_helper.h"
+#include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
+#include "chrome/common/chrome_switches.h"
+#include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/render_frame_host.h"
#if !defined(OS_ANDROID)
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/devtools_agent_host.h"
#endif // !defined(OS_ANDROID)
+namespace {
+
+scoped_ptr<base::DictionaryValue> OpenAppBanner(
+ content::DevToolsAgentHost* agent_host,
+ int command_id,
+ base::DictionaryValue* params) {
+ content::WebContents* web_contents = agent_host->GetWebContents();
+ const bool ret = CoreTabHelper::FromWebContents(web_contents)
+ ->delegate()
+ ->OpenAppBanner(web_contents);
+ if (!ret) {
+ web_contents->GetMainFrame()->AddMessageToConsole(
+ content::CONSOLE_MESSAGE_LEVEL_DEBUG,
+ "add-to-shelf is not supported. Please check chrome://flags/#" +
dominickn 2016/01/17 23:20:19 Nit: this error message could be clearer - perhaps
horo 2016/01/18 06:28:56 Done.
+ std::string(switches::kEnableAddToShelf));
+ }
+ scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
+ result->SetBoolean(chrome::devtools::kResult, ret);
+ return DevToolsProtocol::CreateSuccessResponse(command_id, std::move(result));
+}
+
+} // namespace
+
ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate()
: network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
}
@@ -38,7 +66,18 @@ void ChromeDevToolsManagerDelegate::Inspect(
base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand(
content::DevToolsAgentHost* agent_host,
base::DictionaryValue* command_dict) {
- return network_protocol_handler_->HandleCommand(agent_host, command_dict);
+ int id = 0;
+ std::string method;
+ base::DictionaryValue* params = nullptr;
+ if (!DevToolsProtocol::ParseCommand(command_dict, &id, &method, &params))
+ return nullptr;
+ base::DictionaryValue* ret =
+ network_protocol_handler_->HandleCommand(agent_host, id, method, params);
+ if (ret)
+ return ret;
+ if (method == ::chrome::devtools::Page::openAppBanner::kName)
+ return OpenAppBanner(agent_host, id, params).release();
+ return nullptr;
}
void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged(

Powered by Google App Engine
This is Rietveld 408576698