summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger/browser_list_tabcontents_provider.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 21:12:40 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 21:12:40 +0000
commit4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5 (patch)
treee8e59794adf98f2de8f00299eb3c46fa40c94f02 /chrome/browser/debugger/browser_list_tabcontents_provider.cc
parent9c55de8ff9f0f0f4dc907794266e7bbb21e75b66 (diff)
downloadchromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.zip
chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.tar.gz
chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.tar.bz2
Add method to load resources without scale
This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h I'll cleanup ContentClient in separate CL. BUG=156569 TEST=none. no functional change. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165444 Review URL: https://chromiumcodereview.appspot.com/11341003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/browser_list_tabcontents_provider.cc')
-rw-r--r--chrome/browser/debugger/browser_list_tabcontents_provider.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.cc b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
index 81749b9..cd5a399 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
@@ -18,7 +18,6 @@
#include "content/public/common/url_constants.h"
#include "grit/devtools_discovery_page_resources.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
using content::DevToolsHttpHandlerDelegate;
@@ -46,8 +45,7 @@ std::string BrowserListTabContentsProvider::GetDiscoveryPageHTML() {
}
}
return ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_DEVTOOLS_DISCOVERY_PAGE_HTML,
- ui::SCALE_FACTOR_NONE).as_string();
+ IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
}
bool BrowserListTabContentsProvider::BundlesFrontendResources() {