summaryrefslogtreecommitdiffstats
path: root/ash/tooltips
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 09:34:56 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 09:34:56 +0000
commitd90b839ad378031602d5dbdf846c58994d451403 (patch)
tree013c72c390c7a7e4e9cb76f03a6c9eb29c7d68a2 /ash/tooltips
parent7bc8299dccc300184e850e1a76db110a85234db1 (diff)
downloadchromium_src-d90b839ad378031602d5dbdf846c58994d451403.zip
chromium_src-d90b839ad378031602d5dbdf846c58994d451403.tar.gz
chromium_src-d90b839ad378031602d5dbdf846c58994d451403.tar.bz2
Reland r141871.
Add RootWindowController that keeps per root window state. Cleanup Shell::Init(). Separated initialization that are specific to shell, root window and primary display. I also did small cleanup in detor. I'll do more cleanups when I have a chance. BUG=123160 TEST=no functional change. all tests should pass. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=141871 Review URL: https://chromiumcodereview.appspot.com/10546024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
-rw-r--r--ash/tooltips/tooltip_controller.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 368603d..23b30a5 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -104,7 +104,6 @@ class TooltipController::Tooltip {
label_.set_owned_by_client();
widget_.reset(CreateTooltip());
widget_->SetContentsView(&label_);
- widget_->Activate();
}
~Tooltip() {