diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 04:42:19 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 04:42:19 +0000 |
| commit | 64e53e91daeca9c871bdbd7dcb7b86d051753e2b (patch) | |
| tree | 748f2b243328e340a9e4fa74e71a33d029c0efd6 /webkit | |
| parent | 8f675a9c41f8e8ab8defdae8d464f814de24dd98 (diff) | |
| download | chromium_src-64e53e91daeca9c871bdbd7dcb7b86d051753e2b.zip chromium_src-64e53e91daeca9c871bdbd7dcb7b86d051753e2b.tar.gz chromium_src-64e53e91daeca9c871bdbd7dcb7b86d051753e2b.tar.bz2 | |
move webmenuitem from webkit/glue/ to webkit/common/
TBR=jam@chromium.org
R=jamesr@chromium.org
BUG=239107
Review URL: https://chromiumcodereview.appspot.com/16576008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/webmenuitem.cc (renamed from webkit/glue/webmenuitem.cc) | 4 | ||||
| -rw-r--r-- | webkit/common/webmenuitem.h (renamed from webkit/glue/webmenuitem.h) | 12 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 4 | ||||
| -rw-r--r-- | webkit/glue/webmenurunner_mac.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/webkit/glue/webmenuitem.cc b/webkit/common/webmenuitem.cc index 0b8c37e..68c9a9e 100644 --- a/webkit/glue/webmenuitem.cc +++ b/webkit/common/webmenuitem.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "webkit/glue/webmenuitem.h" +#include "webkit/common/webmenuitem.h" WebMenuItem::WebMenuItem() : type(OPTION), diff --git a/webkit/glue/webmenuitem.h b/webkit/common/webmenuitem.h index 155dea1..0d03f9b 100644 --- a/webkit/glue/webmenuitem.h +++ b/webkit/common/webmenuitem.h @@ -1,19 +1,19 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2013 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 WEBMENUITEM_H_ -#define WEBMENUITEM_H_ +#ifndef WEBKIT_COMMON_WEBMENUITEM_H_ +#define WEBKIT_COMMON_WEBMENUITEM_H_ #include <vector> #include "base/strings/string16.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h" -#include "webkit/glue/webkit_glue_export.h" +#include "webkit/common/webkit_common_export.h" // Container for information about entries in an HTML select popup menu and // custom entries of the context menu. -struct WEBKIT_GLUE_EXPORT WebMenuItem { +struct WEBKIT_COMMON_EXPORT WebMenuItem { enum Type { OPTION = WebKit::WebMenuItemInfo::Option, CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption, @@ -38,4 +38,4 @@ struct WEBKIT_GLUE_EXPORT WebMenuItem { std::vector<WebMenuItem> submenu; }; -#endif // WEBMENUITEM_H_ +#endif // WEBKIT_COMMON_WEBMENUITEM_H_ diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 1d341e7..6719df8 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -123,6 +123,8 @@ '../common/webdropdata.cc', '../common/webdropdata.h', '../common/webkit_common_export.h', + '../common/webmenuitem.cc', + '../common/webmenuitem.h', '../common/webpreferences.cc', '../common/webpreferences.h', 'multipart_response_delegate.cc', @@ -271,8 +273,6 @@ 'webkit_glue_export.h', 'webkitplatformsupport_impl.cc', 'webkitplatformsupport_impl.h', - 'webmenuitem.cc', - 'webmenuitem.h', 'webmenurunner_mac.h', 'webmenurunner_mac.mm', 'websocketstreamhandle_bridge.h', diff --git a/webkit/glue/webmenurunner_mac.h b/webkit/glue/webmenurunner_mac.h index f722b1e..7873745 100644 --- a/webkit/glue/webmenurunner_mac.h +++ b/webkit/glue/webmenurunner_mac.h @@ -10,8 +10,8 @@ #include <vector> #include "base/memory/scoped_nsobject.h" +#include "webkit/common/webmenuitem.h" #include "webkit/glue/webkit_glue_export.h" -#include "webkit/glue/webmenuitem.h" // WebMenuRunner --------------------------------------------------------------- |