diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 22:46:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 22:46:36 +0000 |
| commit | 5d8054efc1e1f26ea806e46869df5e0a84e41a4c (patch) | |
| tree | d9ea6ee9f36f2c49fbc2790a8fbab6e46223b51d /views | |
| parent | 9b5f60667cb4674740ced33201a28acea5ae1183 (diff) | |
| download | chromium_src-5d8054efc1e1f26ea806e46869df5e0a84e41a4c.zip chromium_src-5d8054efc1e1f26ea806e46869df5e0a84e41a4c.tar.gz chromium_src-5d8054efc1e1f26ea806e46869df5e0a84e41a4c.tar.bz2 | |
views: Move standard_layout.h into the layout directory.
Also rename it to layout_constants, as now this file just contains constants.
The grid_layout files will be moved later.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6257017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/message_box_view.cc | 3 | ||||
| -rw-r--r-- | views/grid_layout.cc | 2 | ||||
| -rw-r--r-- | views/layout/layout_constants.h (renamed from views/standard_layout.h) | 9 | ||||
| -rw-r--r-- | views/views.gyp | 1 | ||||
| -rw-r--r-- | views/window/dialog_client_view.cc | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index 2023ca4..c0cd3f8 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -11,7 +11,8 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/message_box_flags.h" #include "views/controls/button/checkbox.h" -#include "views/standard_layout.h" +#include "views/grid_layout.h" +#include "views/layout/layout_constants.h" #include "views/views_delegate.h" #include "views/window/client_view.h" diff --git a/views/grid_layout.cc b/views/grid_layout.cc index b01247f..12f4d9a 100644 --- a/views/grid_layout.cc +++ b/views/grid_layout.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/stl_util-inl.h" #include "gfx/insets.h" -#include "views/standard_layout.h" +#include "views/layout/layout_constants.h" #include "views/view.h" namespace views { diff --git a/views/standard_layout.h b/views/layout/layout_constants.h index 96d36fe..31570b0 100644 --- a/views/standard_layout.h +++ b/views/layout/layout_constants.h @@ -2,13 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_STANDARD_LAYOUT_H_ -#define VIEWS_STANDARD_LAYOUT_H_ +#ifndef VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ +#define VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ #pragma once -#include "views/grid_layout.h" - -// // This file contains some constants we use to implement our standard panel // layout. // see: spec 21/4 @@ -67,4 +64,4 @@ const int kButtonHEdgeMargin = 7; // Horizontal spacing between buttons that are logically related. const int kRelatedButtonHSpacing = 6; -#endif // VIEWS_STANDARD_LAYOUT_H_ +#endif // VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ diff --git a/views/views.gyp b/views/views.gyp index 8543987..3a1f92a 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -283,6 +283,7 @@ 'layout/box_layout.h', 'layout/fill_layout.cc', 'layout/fill_layout.h', + 'layout/layout_constants.h', 'layout/layout_manager.cc', 'layout/layout_manager.h', 'mouse_watcher.cc', diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index d39acec..8420ad8 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -22,7 +22,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" -#include "views/standard_layout.h" +#include "views/layout/layout_constants.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" |