summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornduca@google.com <nduca@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-23 22:11:45 +0000
committernduca@google.com <nduca@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-23 22:11:45 +0000
commitadb11878c09bc7e80a7509cb76b3064120d451b5 (patch)
tree77edd8542a5f4bce04f3356b1004829bda8b0e77
parent455249c190220a9fcf18c0a4ec21024c78fe5de2 (diff)
downloadchromium_src-adb11878c09bc7e80a7509cb76b3064120d451b5.zip
chromium_src-adb11878c09bc7e80a7509cb76b3064120d451b5.tar.gz
chromium_src-adb11878c09bc7e80a7509cb76b3064120d451b5.tar.bz2
Fix overflow scroll
BUG=118626 Review URL: https://chromiumcodereview.appspot.com/9758003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128590 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/tracing/profiling_view.css13
-rw-r--r--chrome/browser/resources/tracing/profiling_view.js4
2 files changed, 5 insertions, 12 deletions
diff --git a/chrome/browser/resources/tracing/profiling_view.css b/chrome/browser/resources/tracing/profiling_view.css
index 1d4bb47..bebc2d7 100644
--- a/chrome/browser/resources/tracing/profiling_view.css
+++ b/chrome/browser/resources/tracing/profiling_view.css
@@ -1,18 +1,13 @@
-/*
-Copyright (c) 2011 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
-*/
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file. */
#profiling-view {
+ display: -webkit-box;
padding: 0;
-webkit-box-orient: vertical;
-webkit-box-flex: 1;
}
-#profiling-view[selected] {
- display: -webkit-box;
-}
-
#profiling-view > .control {
display: -webkit-box;
border-bottom: 1px solid #555;
diff --git a/chrome/browser/resources/tracing/profiling_view.js b/chrome/browser/resources/tracing/profiling_view.js
index 26ea755..75c6fb6 100644
--- a/chrome/browser/resources/tracing/profiling_view.js
+++ b/chrome/browser/resources/tracing/profiling_view.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -77,8 +77,6 @@ cr.define('tracing', function() {
onKeypress_: function(event) {
if (event.keyCode == 114 && !tracingController.isTracingEnabled) {
- if (!this.selected)
- this.selected = true;
this.onRecord_();
}
},