| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/oak/oak_window.h" | 5 #include "ui/oak/oak_window.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
| 9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 details_model_->SetValue(tree_model_->AsNode(tree->GetSelectedNode())->value); | 113 details_model_->SetValue(tree_model_->AsNode(tree->GetSelectedNode())->value); |
| 114 } | 114 } |
| 115 | 115 |
| 116 //////////////////////////////////////////////////////////////////////////////// | 116 //////////////////////////////////////////////////////////////////////////////// |
| 117 // OakWindow, private: | 117 // OakWindow, private: |
| 118 | 118 |
| 119 void OakWindow::Init() { | 119 void OakWindow::Init() { |
| 120 tree_model_.reset( | 120 tree_model_.reset( |
| 121 GenerateModel(GetWidget()->GetNativeView()->GetRootWindow())); | 121 GenerateModel(GetWidget()->GetNativeView()->GetRootWindow())); |
| 122 tree_.reset(new views::TreeView); | 122 tree_.reset(new views::TreeView); |
| 123 tree_->set_parent_owned(false); | 123 tree_->set_owned_by_client(); |
| 124 tree_->SetController(this); | 124 tree_->SetController(this); |
| 125 tree_->SetModel(tree_model_.get()); | 125 tree_->SetModel(tree_model_.get()); |
| 126 tree_container_ = tree_->CreateParentIfNecessary(); | 126 tree_container_ = tree_->CreateParentIfNecessary(); |
| 127 AddChildView(tree_container_); | 127 AddChildView(tree_container_); |
| 128 | 128 |
| 129 details_model_.reset(new OakAuraWindowDisplay); | 129 details_model_.reset(new OakAuraWindowDisplay); |
| 130 std::vector<ui::TableColumn> columns; | 130 std::vector<ui::TableColumn> columns; |
| 131 columns.push_back(ui::TableColumn()); | 131 columns.push_back(ui::TableColumn()); |
| 132 details_.reset(new views::TableView(details_model_.get(), | 132 details_.reset(new views::TableView(details_model_.get(), |
| 133 columns, | 133 columns, |
| 134 views::TEXT_ONLY, | 134 views::TEXT_ONLY, |
| 135 true, | 135 true, |
| 136 false, | 136 false, |
| 137 false)); | 137 false)); |
| 138 details_->set_parent_owned(false); | 138 details_->set_owned_by_client(); |
| 139 details_container_ = details_->CreateParentIfNecessary(); | 139 details_container_ = details_->CreateParentIfNecessary(); |
| 140 details_->SetModel(details_model_.get()); | 140 details_->SetModel(details_model_.get()); |
| 141 AddChildView(details_container_); | 141 AddChildView(details_container_); |
| 142 | 142 |
| 143 OnTreeViewSelectionChanged(tree_.get()); | 143 OnTreeViewSelectionChanged(tree_.get()); |
| 144 } | 144 } |
| 145 | 145 |
| 146 } // namespace internal | 146 } // namespace internal |
| 147 | 147 |
| 148 void ShowOakWindow() { | 148 void ShowOakWindow() { |
| 149 if (!internal::OakWindow::instance) { | 149 if (!internal::OakWindow::instance) { |
| 150 internal::OakWindow::instance = | 150 internal::OakWindow::instance = |
| 151 views::Widget::CreateWindowWithBounds(new internal::OakWindow, | 151 views::Widget::CreateWindowWithBounds(new internal::OakWindow, |
| 152 gfx::Rect(10, 10, 500, 500)); | 152 gfx::Rect(10, 10, 500, 500)); |
| 153 } | 153 } |
| 154 internal::OakWindow::instance->Show(); | 154 internal::OakWindow::instance->Show(); |
| 155 } | 155 } |
| 156 | 156 |
| 157 } // namespace oak | 157 } // namespace oak |
| OLD | NEW |