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

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 306 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
317 TabContents* tab_contents,	317 TabContents* tab_contents,

318 const GURL& url,	318 const GURL& url,

319 const content::SSLStatus& ssl,	319 const content::SSLStatus& ssl,

320 bool show_history) OVERRIDE;	320 bool show_history) OVERRIDE;

321 virtual void ShowAppMenu() OVERRIDE;	321 virtual void ShowAppMenu() OVERRIDE;

322 virtual bool PreHandleKeyboardEvent(	322 virtual bool PreHandleKeyboardEvent(

323 const content::NativeWebKeyboardEvent& event,	323 const content::NativeWebKeyboardEvent& event,

324 bool* is_keyboard_shortcut) OVERRIDE;	324 bool* is_keyboard_shortcut) OVERRIDE;

325 virtual void HandleKeyboardEvent(	325 virtual void HandleKeyboardEvent(

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

327 virtual void ShowCreateWebAppShortcutsDialog(

328 TabContents* tab_contents) OVERRIDE;

329 virtual void ShowCreateChromeAppShortcutsDialog(	327 virtual void ShowCreateChromeAppShortcutsDialog(

330 Profile, const extensions::Extension app) OVERRIDE;	328 Profile, const extensions::Extension app) OVERRIDE;

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

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

333 virtual void Paste() OVERRIDE;	331 virtual void Paste() OVERRIDE;

334 virtual void ShowInstant(TabContents* preview) OVERRIDE;	332 virtual void ShowInstant(TabContents* preview) OVERRIDE;

335 virtual void HideInstant() OVERRIDE;	333 virtual void HideInstant() OVERRIDE;

336 virtual gfx::Rect GetInstantBounds() OVERRIDE;	334 virtual gfx::Rect GetInstantBounds() OVERRIDE;

337 virtual WindowOpenDisposition GetDispositionForPopupBounds(	335 virtual WindowOpenDisposition GetDispositionForPopupBounds(

338 const gfx::Rect& bounds) OVERRIDE;	336 const gfx::Rect& bounds) OVERRIDE;

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

708	706

709 #if defined(USE_AURA)	707 #if defined(USE_AURA)

710 scoped_ptr<SearchViewController> search_view_controller_;	708 scoped_ptr<SearchViewController> search_view_controller_;

711 #endif	709 #endif

712	710

713 DISALLOW_COPY_AND_ASSIGN(BrowserView);	711 DISALLOW_COPY_AND_ASSIGN(BrowserView);

714 };	712 };

715	713

716 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_	714 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

OLD	NEW