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

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

Issue 10117016: Implementation for switching between recently used tabs using ctrl tilde or quoteleft. Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Uploading patch for review after rebase. 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
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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/prefs/pref_member.h" 23 #include "chrome/browser/prefs/pref_member.h"
24 #include "chrome/browser/sessions/session_id.h" 24 #include "chrome/browser/sessions/session_id.h"
25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
28 #include "chrome/browser/ui/browser_navigator.h" 28 #include "chrome/browser/ui/browser_navigator.h"
29 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" 29 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
30 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 30 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
31 #include "chrome/browser/ui/select_file_dialog.h" 31 #include "chrome/browser/ui/select_file_dialog.h"
32 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 32 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
33 #include "chrome/browser/ui/tabs/mru_tab_controller.h"
33 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
34 #include "chrome/browser/ui/toolbar/toolbar_model.h" 35 #include "chrome/browser/ui/toolbar/toolbar_model.h"
35 #include "chrome/browser/ui/zoom/zoom_observer.h" 36 #include "chrome/browser/ui/zoom/zoom_observer.h"
36 #include "chrome/common/content_settings.h" 37 #include "chrome/common/content_settings.h"
37 #include "chrome/common/content_settings_types.h" 38 #include "chrome/common/content_settings_types.h"
38 #include "chrome/common/extensions/extension_constants.h" 39 #include "chrome/common/extensions/extension_constants.h"
39 #include "content/public/browser/notification_registrar.h" 40 #include "content/public/browser/notification_registrar.h"
40 #include "content/public/browser/page_navigator.h" 41 #include "content/public/browser/page_navigator.h"
41 #include "content/public/browser/web_contents_delegate.h" 42 #include "content/public/browser/web_contents_delegate.h"
42 #include "content/public/common/page_transition_types.h" 43 #include "content/public/common/page_transition_types.h"
43 #include "content/public/common/page_zoom.h" 44 #include "content/public/common/page_zoom.h"
44 #include "ui/base/ui_base_types.h" 45 #include "ui/base/ui_base_types.h"
45 #include "ui/gfx/rect.h" 46 #include "ui/gfx/rect.h"
46 47
47 class BrowserContentSettingBubbleModelDelegate; 48 class BrowserContentSettingBubbleModelDelegate;
48 class BrowserSyncedWindowDelegate; 49 class BrowserSyncedWindowDelegate;
49 class BrowserToolbarModelDelegate; 50 class BrowserToolbarModelDelegate;
50 class BrowserTabRestoreServiceDelegate; 51 class BrowserTabRestoreServiceDelegate;
51 class BrowserWindow; 52 class BrowserWindow;
52 class FindBarController; 53 class FindBarController;
53 class FullscreenController; 54 class FullscreenController;
55 class MRUTabController;
54 class PrefService; 56 class PrefService;
55 class Profile; 57 class Profile;
56 class SkBitmap; 58 class SkBitmap;
57 class StatusBubble; 59 class StatusBubble;
58 class TabNavigation; 60 class TabNavigation;
59 class TabStripModel; 61 class TabStripModel;
60 class TabStripModelDelegate; 62 class TabStripModelDelegate;
61 struct WebApplicationInfo; 63 struct WebApplicationInfo;
62 64
63 namespace chrome { 65 namespace chrome {
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 void ShowFirstRunBubble(); 479 void ShowFirstRunBubble();
478 480
479 FullscreenController* fullscreen_controller() { 481 FullscreenController* fullscreen_controller() {
480 return fullscreen_controller_.get(); 482 return fullscreen_controller_.get();
481 } 483 }
482 484
483 extensions::WindowController* extension_window_controller() const { 485 extensions::WindowController* extension_window_controller() const {
484 return extension_window_controller_.get(); 486 return extension_window_controller_.get();
485 } 487 }
486 488
489 MRUTabController* mru_tab_controller() const {
490 return mru_tab_controller_.get();
491 }
492
487 protected: 493 protected:
488 // Funnel for the factory method in BrowserWindow. This allows subclasses to 494 // Funnel for the factory method in BrowserWindow. This allows subclasses to
489 // set their own window. 495 // set their own window.
490 virtual BrowserWindow* CreateBrowserWindow(); 496 virtual BrowserWindow* CreateBrowserWindow();
491 497
492 private: 498 private:
493 friend class BrowserTest; 499 friend class BrowserTest;
494 friend class FullscreenControllerTest; 500 friend class FullscreenControllerTest;
495 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); 501 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
496 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); 502 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 813
808 // This Browser's profile. 814 // This Browser's profile.
809 Profile* const profile_; 815 Profile* const profile_;
810 816
811 // This Browser's window. 817 // This Browser's window.
812 BrowserWindow* window_; 818 BrowserWindow* window_;
813 819
814 scoped_ptr<TabStripModelDelegate> tab_strip_model_delegate_; 820 scoped_ptr<TabStripModelDelegate> tab_strip_model_delegate_;
815 scoped_ptr<TabStripModel> tab_strip_model_; 821 scoped_ptr<TabStripModel> tab_strip_model_;
816 822
823 scoped_ptr<MRUTabController> mru_tab_controller_;
824
817 // The application name that is also the name of the window to the shell. 825 // The application name that is also the name of the window to the shell.
818 // This name should be set when: 826 // This name should be set when:
819 // 1) we launch an application via an application shortcut or extension API. 827 // 1) we launch an application via an application shortcut or extension API.
820 // 2) we launch an undocked devtool window. 828 // 2) we launch an undocked devtool window.
821 std::string app_name_; 829 std::string app_name_;
822 830
823 // Type of app (host or child). See description of AppType. 831 // Type of app (host or child). See description of AppType.
824 AppType app_type_; 832 AppType app_type_;
825 833
826 // Unique identifier of this browser for session restore. This id is only 834 // Unique identifier of this browser for session restore. This id is only
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 bool window_has_shown_; 933 bool window_has_shown_;
926 934
927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 935 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
928 // before DidEndColorChooser is called. 936 // before DidEndColorChooser is called.
929 scoped_ptr<content::ColorChooser> color_chooser_; 937 scoped_ptr<content::ColorChooser> color_chooser_;
930 938
931 DISALLOW_COPY_AND_ASSIGN(Browser); 939 DISALLOW_COPY_AND_ASSIGN(Browser);
932 }; 940 };
933 941
934 #endif // CHROME_BROWSER_UI_BROWSER_H_ 942 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698