Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 9428018: Create BaseWindow and ExtensionWindowWrapper for extension API access to Panels (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 9 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
« no previous file with comments | « chrome/browser/ui/base_window.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "content/public/browser/web_contents_delegate.h" 49 #include "content/public/browser/web_contents_delegate.h"
50 #include "content/public/common/page_transition_types.h" 50 #include "content/public/common/page_transition_types.h"
51 #include "content/public/common/page_zoom.h" 51 #include "content/public/common/page_zoom.h"
52 #include "ui/base/ui_base_types.h" 52 #include "ui/base/ui_base_types.h"
53 #include "ui/gfx/rect.h" 53 #include "ui/gfx/rect.h"
54 54
55 class BrowserSyncedWindowDelegate; 55 class BrowserSyncedWindowDelegate;
56 class BrowserTabRestoreServiceDelegate; 56 class BrowserTabRestoreServiceDelegate;
57 class BrowserWindow; 57 class BrowserWindow;
58 class Extension; 58 class Extension;
59 class ExtensionWindowController;
59 class FindBarController; 60 class FindBarController;
60 class FullscreenController; 61 class FullscreenController;
61 class HtmlDialogUIDelegate; 62 class HtmlDialogUIDelegate;
62 class InstantController; 63 class InstantController;
63 class InstantUnloadHandler; 64 class InstantUnloadHandler;
64 class PrefService; 65 class PrefService;
65 class Profile; 66 class Profile;
66 class SkBitmap; 67 class SkBitmap;
67 class StatusBubble; 68 class StatusBubble;
68 class TabNavigation; 69 class TabNavigation;
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 void MoveTabPrevious(); 550 void MoveTabPrevious();
550 void SelectNumberedTab(int index); 551 void SelectNumberedTab(int index);
551 void SelectLastTab(); 552 void SelectLastTab();
552 void DuplicateTab(); 553 void DuplicateTab();
553 void WriteCurrentURLToClipboard(); 554 void WriteCurrentURLToClipboard();
554 void ConvertPopupToTabbedBrowser(); 555 void ConvertPopupToTabbedBrowser();
555 // In kiosk mode, the first toggle is valid, the rest is discarded. 556 // In kiosk mode, the first toggle is valid, the rest is discarded.
556 void ToggleFullscreenMode(); 557 void ToggleFullscreenMode();
557 // See the description of 558 // See the description of
558 // FullscreenController::ToggleFullscreenModeWithExtension. 559 // FullscreenController::ToggleFullscreenModeWithExtension.
559 void ToggleFullscreenModeWithExtension(const Extension& extension); 560 void ToggleFullscreenModeWithExtension(const GURL& extension_url);
560 #if defined(OS_MACOSX) 561 #if defined(OS_MACOSX)
561 void TogglePresentationMode(); 562 void TogglePresentationMode();
562 #endif 563 #endif
563 void Exit(); 564 void Exit();
564 #if defined(OS_CHROMEOS) 565 #if defined(OS_CHROMEOS)
565 void Search(); 566 void Search();
566 void ShowKeyboardOverlay(); 567 void ShowKeyboardOverlay();
567 #endif 568 #endif
568 569
569 // Page-related commands 570 // Page-related commands
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 // True when the current tab is in fullscreen mode, requested by 884 // True when the current tab is in fullscreen mode, requested by
884 // webkitRequestFullScreen. 885 // webkitRequestFullScreen.
885 bool IsFullscreenForTab() const; 886 bool IsFullscreenForTab() const;
886 887
887 // Called each time the browser window is shown. 888 // Called each time the browser window is shown.
888 void OnWindowDidShow(); 889 void OnWindowDidShow();
889 890
890 // Show the first run search engine bubble on the location bar. 891 // Show the first run search engine bubble on the location bar.
891 void ShowFirstRunBubble(); 892 void ShowFirstRunBubble();
892 893
894 ExtensionWindowController* extension_window_controller() const {
895 return extension_window_controller_.get();
896 }
897
893 protected: 898 protected:
894 // Wrapper for the factory method in BrowserWindow. This allows subclasses to 899 // Wrapper for the factory method in BrowserWindow. This allows subclasses to
895 // set their own window. 900 // set their own window.
896 virtual BrowserWindow* CreateBrowserWindow(); 901 virtual BrowserWindow* CreateBrowserWindow();
897 902
898 private: 903 private:
899 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); 904 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
900 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); 905 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
901 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); 906 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
902 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); 907 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1454 // Helper which implements the SyncedWindowDelegate interface. 1459 // Helper which implements the SyncedWindowDelegate interface.
1455 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; 1460 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_;
1456 1461
1457 scoped_ptr<InstantController> instant_; 1462 scoped_ptr<InstantController> instant_;
1458 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1463 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1459 1464
1460 BookmarkBar::State bookmark_bar_state_; 1465 BookmarkBar::State bookmark_bar_state_;
1461 1466
1462 scoped_refptr<FullscreenController> fullscreen_controller_; 1467 scoped_refptr<FullscreenController> fullscreen_controller_;
1463 1468
1469 scoped_ptr<ExtensionWindowController> extension_window_controller_;
1470
1464 // True if the browser window has been shown at least once. 1471 // True if the browser window has been shown at least once.
1465 bool window_has_shown_; 1472 bool window_has_shown_;
1466 1473
1467 DISALLOW_COPY_AND_ASSIGN(Browser); 1474 DISALLOW_COPY_AND_ASSIGN(Browser);
1468 }; 1475 };
1469 1476
1470 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1477 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/base_window.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698