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

Unified Diff: mash/wm/frame/caption_buttons/caption_button_types.h

Issue 1459653002: Gets mustash frames looking like that of ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update test Created 5 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 | « mash/wm/DEPS ('k') | mash/wm/frame/caption_buttons/frame_caption_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/frame/caption_buttons/caption_button_types.h
diff --git a/ash/frame/caption_buttons/caption_button_types.h b/mash/wm/frame/caption_buttons/caption_button_types.h
similarity index 62%
copy from ash/frame/caption_buttons/caption_button_types.h
copy to mash/wm/frame/caption_buttons/caption_button_types.h
index 0e02c3104c5bcc926b7828e7d747aded3db13733..3bda201dc8691c143ae9e4273611cc2cc7fba7fe 100644
--- a/ash/frame/caption_buttons/caption_button_types.h
+++ b/mash/wm/frame/caption_buttons/caption_button_types.h
@@ -1,11 +1,12 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 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.
-#ifndef ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
-#define ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
+#ifndef MASH_WM_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
+#define MASH_WM_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
-namespace ash {
+namespace mash {
+namespace wm {
// These are the icon types that a caption button can have. The size button's
// action (SnapType) can be different from its icon.
@@ -20,6 +21,7 @@ enum CaptionButtonIcon {
CAPTION_BUTTON_ICON_COUNT
};
-} // namespace ash
+} // namespace wm
+} // namespace mash
-#endif // ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
+#endif // MASH_WM_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
« no previous file with comments | « mash/wm/DEPS ('k') | mash/wm/frame/caption_buttons/frame_caption_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698