summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 17:33:03 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 17:33:03 +0000
commit995e402e14f8dd8c48efc6a191e9b8764700d617 (patch)
treed77b95716b36c439f9588c8041fd61e5aac6fc0c /chrome/common
parent8f90bbcedd2241d361fc9cb8e93803343698500b (diff)
downloadchromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.zip
chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.tar.gz
chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.tar.bz2
Attemp 2 at:
Makes the toolbar visible for apps again. Here's the set of patches I reverted: 49016, 47119, 47177, 46930, 46775, and the UI changes for 45566) If you see anything missing, please let me know. Also, there are some grd strings no longer necessary. I'll nuke those separately. BUG=49013 TEST=none TBR=finnur Review URL: http://codereview.chromium.org/3056003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/extension.h1
-rw-r--r--chrome/common/notification_type.h4
2 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 8e55fa2..539b104 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -579,7 +579,6 @@ class Extension {
FRIEND_TEST(ExtensionTest, LoadPageActionHelper);
FRIEND_TEST(TabStripModelTest, Apps);
- FRIEND_TEST(TabStripModelTest, ToolbarVisibility);
DISALLOW_COPY_AND_ASSIGN(Extension);
};
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 1bafff6..9f75bb4 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -881,10 +881,6 @@ class NotificationType {
// session. The source is the profile.
EXTENSION_OMNIBOX_INPUT_ENTERED,
- // The source is the extension object that changed. Details is a bool*
- // with the new visibility.
- EXTENSION_APP_TOOLBAR_VISIBILITY_CHANGED,
-
// Debugging ---------------------------------------------------------------
// TODO(mpcomplete): Sent to diagnose a bug. Remove when fixed.