| 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_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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 class BrowserWindow; | 58 class BrowserWindow; |
| 59 class ExtensionWindowController; | 59 class ExtensionWindowController; |
| 60 class FindBarController; | 60 class FindBarController; |
| 61 class FullscreenController; | 61 class FullscreenController; |
| 62 class InstantController; | 62 class InstantController; |
| 63 class InstantUnloadHandler; | 63 class InstantUnloadHandler; |
| 64 class PrefService; | 64 class PrefService; |
| 65 class Profile; | 65 class Profile; |
| 66 class SkBitmap; | 66 class SkBitmap; |
| 67 class StatusBubble; | 67 class StatusBubble; |
| 68 class TabMRUListManager; |
| 68 class TabNavigation; | 69 class TabNavigation; |
| 69 class TabStripModel; | 70 class TabStripModel; |
| 70 struct WebApplicationInfo; | 71 struct WebApplicationInfo; |
| 71 class WebDialogDelegate; | 72 class WebDialogDelegate; |
| 72 | 73 |
| 73 namespace content { | 74 namespace content { |
| 74 class NavigationController; | 75 class NavigationController; |
| 75 class SessionStorageNamespace; | 76 class SessionStorageNamespace; |
| 76 } | 77 } |
| 77 | 78 |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 void CloseWindow(); | 513 void CloseWindow(); |
| 513 void NewTab(); | 514 void NewTab(); |
| 514 void CloseTab(); | 515 void CloseTab(); |
| 515 void SelectNextTab(); | 516 void SelectNextTab(); |
| 516 void SelectPreviousTab(); | 517 void SelectPreviousTab(); |
| 517 void OpenTabpose(); | 518 void OpenTabpose(); |
| 518 void MoveTabNext(); | 519 void MoveTabNext(); |
| 519 void MoveTabPrevious(); | 520 void MoveTabPrevious(); |
| 520 void SelectNumberedTab(int index); | 521 void SelectNumberedTab(int index); |
| 521 void SelectLastTab(); | 522 void SelectLastTab(); |
| 523 void SelectNextMRUTab(); |
| 522 void DuplicateTab(); | 524 void DuplicateTab(); |
| 523 void WriteCurrentURLToClipboard(); | 525 void WriteCurrentURLToClipboard(); |
| 524 void ConvertPopupToTabbedBrowser(); | 526 void ConvertPopupToTabbedBrowser(); |
| 525 // In kiosk mode, the first toggle is valid, the rest is discarded. | 527 // In kiosk mode, the first toggle is valid, the rest is discarded. |
| 526 void ToggleFullscreenMode(); | 528 void ToggleFullscreenMode(); |
| 527 // See the description of | 529 // See the description of |
| 528 // FullscreenController::ToggleFullscreenModeWithExtension. | 530 // FullscreenController::ToggleFullscreenModeWithExtension. |
| 529 void ToggleFullscreenModeWithExtension(const GURL& extension_url); | 531 void ToggleFullscreenModeWithExtension(const GURL& extension_url); |
| 530 #if defined(OS_MACOSX) | 532 #if defined(OS_MACOSX) |
| 531 void TogglePresentationMode(); | 533 void TogglePresentationMode(); |
| (...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1269 const Type type_; | 1271 const Type type_; |
| 1270 | 1272 |
| 1271 // This Browser's profile. | 1273 // This Browser's profile. |
| 1272 Profile* const profile_; | 1274 Profile* const profile_; |
| 1273 | 1275 |
| 1274 // This Browser's window. | 1276 // This Browser's window. |
| 1275 BrowserWindow* window_; | 1277 BrowserWindow* window_; |
| 1276 | 1278 |
| 1277 scoped_ptr<TabStripModel> tab_strip_model_; | 1279 scoped_ptr<TabStripModel> tab_strip_model_; |
| 1278 | 1280 |
| 1281 scoped_ptr<TabMRUListManager> tab_mru_list_manager_; |
| 1282 |
| 1279 // The CommandUpdater that manages the browser window commands. | 1283 // The CommandUpdater that manages the browser window commands. |
| 1280 CommandUpdater command_updater_; | 1284 CommandUpdater command_updater_; |
| 1281 | 1285 |
| 1282 // The application name that is also the name of the window to the shell. | 1286 // The application name that is also the name of the window to the shell. |
| 1283 // This name should be set when: | 1287 // This name should be set when: |
| 1284 // 1) we launch an application via an application shortcut or extension API. | 1288 // 1) we launch an application via an application shortcut or extension API. |
| 1285 // 2) we launch an undocked devtool window. | 1289 // 2) we launch an undocked devtool window. |
| 1286 std::string app_name_; | 1290 std::string app_name_; |
| 1287 | 1291 |
| 1288 // Type of app (host or child). See description of AppType. | 1292 // Type of app (host or child). See description of AppType. |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1406 bool window_has_shown_; | 1410 bool window_has_shown_; |
| 1407 | 1411 |
| 1408 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1412 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1409 // before DidEndColorChooser is called. | 1413 // before DidEndColorChooser is called. |
| 1410 scoped_ptr<content::ColorChooser> color_chooser_; | 1414 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1411 | 1415 |
| 1412 DISALLOW_COPY_AND_ASSIGN(Browser); | 1416 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1413 }; | 1417 }; |
| 1414 | 1418 |
| 1415 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1419 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |