chrome/browser/ui/views/frame/browser_view.h - Issue 10699057: Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel…

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 10699057: Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 months 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/extensions/extension_tab_helper.cc ('K') | « chrome/browser/ui/views/extensions/extension_install_dialog_view.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

7 #pragma once	7 #pragma once

8	8

9 #include <map>	9 #include <map>

10 #include <string>	10 #include <string>

(...skipping 305 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
316 TabContents* tab_contents,	316 TabContents* tab_contents,

317 const GURL& url,	317 const GURL& url,

318 const content::SSLStatus& ssl,	318 const content::SSLStatus& ssl,

319 bool show_history) OVERRIDE;	319 bool show_history) OVERRIDE;

320 virtual void ShowAppMenu() OVERRIDE;	320 virtual void ShowAppMenu() OVERRIDE;

321 virtual bool PreHandleKeyboardEvent(	321 virtual bool PreHandleKeyboardEvent(

322 const content::NativeWebKeyboardEvent& event,	322 const content::NativeWebKeyboardEvent& event,

323 bool* is_keyboard_shortcut) OVERRIDE;	323 bool* is_keyboard_shortcut) OVERRIDE;

324 virtual void HandleKeyboardEvent(	324 virtual void HandleKeyboardEvent(

325 const content::NativeWebKeyboardEvent& event) OVERRIDE;	325 const content::NativeWebKeyboardEvent& event) OVERRIDE;

326 virtual void ShowCreateWebAppShortcutsDialog(

327 TabContents* tab_contents) OVERRIDE;

328 virtual void ShowCreateChromeAppShortcutsDialog(	326 virtual void ShowCreateChromeAppShortcutsDialog(

329 Profile, const extensions::Extension app) OVERRIDE;	327 Profile, const extensions::Extension app) OVERRIDE;

330 virtual void Cut() OVERRIDE;	328 virtual void Cut() OVERRIDE;

331 virtual void Copy() OVERRIDE;	329 virtual void Copy() OVERRIDE;

332 virtual void Paste() OVERRIDE;	330 virtual void Paste() OVERRIDE;

333 virtual void ShowInstant(TabContents* preview) OVERRIDE;	331 virtual void ShowInstant(TabContents* preview) OVERRIDE;

334 virtual void HideInstant() OVERRIDE;	332 virtual void HideInstant() OVERRIDE;

335 virtual gfx::Rect GetInstantBounds() OVERRIDE;	333 virtual gfx::Rect GetInstantBounds() OVERRIDE;

336 virtual WindowOpenDisposition GetDispositionForPopupBounds(	334 virtual WindowOpenDisposition GetDispositionForPopupBounds(

337 const gfx::Rect& bounds) OVERRIDE;	335 const gfx::Rect& bounds) OVERRIDE;

(...skipping 368 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
706 gfx::ScopedSysColorChangeListener color_change_listener_;	704 gfx::ScopedSysColorChangeListener color_change_listener_;

707	705

708 #if defined(USE_AURA)	706 #if defined(USE_AURA)

709 scoped_ptr<SearchViewController> search_view_controller_;	707 scoped_ptr<SearchViewController> search_view_controller_;

710 #endif	708 #endif

711	709

712 DISALLOW_COPY_AND_ASSIGN(BrowserView);	710 DISALLOW_COPY_AND_ASSIGN(BrowserView);

713 };	711 };

714	712

715 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_	713 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

OLD	NEW