diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 03:44:00 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 03:44:00 +0000 |
| commit | 382f975acaf866d18b67c092381fd7f71f60968a (patch) | |
| tree | 14917f3b32e2442226160128253e910da649786b /chrome/browser/tab_contents/render_view_context_menu.h | |
| parent | dbb66e6bf4914172a96f5121b1ffcad73fb0826d (diff) | |
| download | chromium_src-382f975acaf866d18b67c092381fd7f71f60968a.zip chromium_src-382f975acaf866d18b67c092381fd7f71f60968a.tar.gz chromium_src-382f975acaf866d18b67c092381fd7f71f60968a.tar.bz2 | |
Revert 116803 - Don't use browser windows for platform app shell windows.
This frees platform apps from having to disable browser behaviors they don't
want (e.g. keyboard shortcuts).
Reverts part of r112378, which add a "shell" browser window type, and redoes
part of r114162 to not depend on browser windows when checking if the context
menu is being displayed for a platform app.
Review URL: http://codereview.chromium.org/8985008
TBR=mihaip@chromium.org
Review URL: http://codereview.chromium.org/9125021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/render_view_context_menu.h')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h index d07bb49..9bfd5edf 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.h +++ b/chrome/browser/tab_contents/render_view_context_menu.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 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. @@ -193,11 +193,6 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate, const ContextMenuParams& params, Profile* profile, bool can_cross_incognito); - - // Gets the platform app (if any) associated with the TabContents that we're - // in. - const Extension* GetPlatformApp() const; - void AppendPlatformAppItems(); bool AppendCustomItems(); void AppendDeveloperItems(); void AppendLinkItems(); |