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

Unified Diff: views/window/client_view.cc

Issue 8552005: views: Move views/window/ to ui/views/window directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « views/window/client_view.h ('k') | views/window/custom_frame_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/client_view.cc
diff --git a/views/window/client_view.cc b/views/window/client_view.cc
deleted file mode 100644
index 560983b8b5a1b071951768c982c4088bdc9d256f..0000000000000000000000000000000000000000
--- a/views/window/client_view.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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.
-
-#include "views/window/client_view.h"
-
-#include "base/logging.h"
-#include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/hit_test.h"
-#include "views/widget/widget.h"
-#include "views/widget/widget_delegate.h"
-
-namespace views {
-
-// static
-const char ClientView::kViewClassName[] =
- "views/window/ClientView";
-
-///////////////////////////////////////////////////////////////////////////////
-// ClientView, public:
-
-ClientView::ClientView(Widget* widget, View* contents_view)
- : widget_(widget),
- contents_view_(contents_view) {
-}
-
-int ClientView::NonClientHitTest(const gfx::Point& point) {
- return bounds().Contains(point) ? HTCLIENT : HTNOWHERE;
-}
-
-DialogClientView* ClientView::AsDialogClientView() {
- return NULL;
-}
-
-const DialogClientView* ClientView::AsDialogClientView() const {
- return NULL;
-}
-
-bool ClientView::CanClose() {
- return true;
-}
-
-void ClientView::WidgetClosing() {
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// ClientView, View overrides:
-
-gfx::Size ClientView::GetPreferredSize() {
- // |contents_view_| is allowed to be NULL up until the point where this view
- // is attached to a Container.
- if (contents_view_)
- return contents_view_->GetPreferredSize();
- return gfx::Size();
-}
-
-void ClientView::Layout() {
- // |contents_view_| is allowed to be NULL up until the point where this view
- // is attached to a Container.
- if (contents_view_)
- contents_view_->SetBounds(0, 0, width(), height());
-}
-
-std::string ClientView::GetClassName() const {
- return kViewClassName;
-}
-
-void ClientView::GetAccessibleState(ui::AccessibleViewState* state) {
- state->role = ui::AccessibilityTypes::ROLE_CLIENT;
-}
-
-void ClientView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
- // Overridden to do nothing. The NonClientView manually calls Layout on the
- // ClientView when it is itself laid out, see comment in
- // NonClientView::Layout.
-}
-
-void ClientView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
- if (is_add && child == this) {
- DCHECK(GetWidget());
- DCHECK(contents_view_); // |contents_view_| must be valid now!
- // Insert |contents_view_| at index 0 so it is first in the focus chain.
- // (the OK/Cancel buttons are inserted before contents_view_)
- AddChildViewAt(contents_view_, 0);
- }
-}
-
-} // namespace views
« no previous file with comments | « views/window/client_view.h ('k') | views/window/custom_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698