| 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 public ui::SelectFileDialog::Listener, | 104 public ui::SelectFileDialog::Listener, |
| 105 public SearchModelObserver { | 105 public SearchModelObserver { |
| 106 public: | 106 public: |
| 107 // SessionService::WindowType mirrors these values. If you add to this | 107 // SessionService::WindowType mirrors these values. If you add to this |
| 108 // enum, look at SessionService::WindowType to see if it needs to be | 108 // enum, look at SessionService::WindowType to see if it needs to be |
| 109 // updated. | 109 // updated. |
| 110 enum Type { | 110 enum Type { |
| 111 // If you add a new type, consider updating the test | 111 // If you add a new type, consider updating the test |
| 112 // BrowserTest.StartMaximized. | 112 // BrowserTest.StartMaximized. |
| 113 TYPE_TABBED = 1, | 113 TYPE_TABBED = 1, |
| 114 TYPE_POPUP = 2, | 114 TYPE_POPUP = 2 |
| 115 TYPE_PANEL = 3 | |
| 116 }; | 115 }; |
| 117 | 116 |
| 118 // Distinguishes between browsers that host an app (opened from | 117 // Distinguishes between browsers that host an app (opened from |
| 119 // ApplicationLauncher::OpenApplication), and child browsers created by an app | 118 // ApplicationLauncher::OpenApplication), and child browsers created by an app |
| 120 // from Browser::CreateForApp (e.g. by windows.open or the extension API). | 119 // from Browser::CreateForApp (e.g. by windows.open or the extension API). |
| 121 enum AppType { | 120 enum AppType { |
| 122 APP_TYPE_HOST = 1, | 121 APP_TYPE_HOST = 1, |
| 123 APP_TYPE_CHILD = 2 | 122 APP_TYPE_CHILD = 2 |
| 124 }; | 123 }; |
| 125 | 124 |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 bool* is_keyboard_shortcut) OVERRIDE; | 430 bool* is_keyboard_shortcut) OVERRIDE; |
| 432 virtual void HandleKeyboardEvent( | 431 virtual void HandleKeyboardEvent( |
| 433 content::WebContents* source, | 432 content::WebContents* source, |
| 434 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 433 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
| 435 | 434 |
| 436 // Figure out if there are tabs that have beforeunload handlers. | 435 // Figure out if there are tabs that have beforeunload handlers. |
| 437 bool TabsNeedBeforeUnloadFired(); | 436 bool TabsNeedBeforeUnloadFired(); |
| 438 | 437 |
| 439 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } | 438 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } |
| 440 bool is_type_popup() const { return type_ == TYPE_POPUP; } | 439 bool is_type_popup() const { return type_ == TYPE_POPUP; } |
| 441 bool is_type_panel() const { return type_ == TYPE_PANEL; } | |
| 442 | 440 |
| 443 bool is_app() const; | 441 bool is_app() const; |
| 444 bool is_devtools() const; | 442 bool is_devtools() const; |
| 445 | 443 |
| 446 // True when the mouse cursor is locked. | 444 // True when the mouse cursor is locked. |
| 447 bool IsMouseLocked() const; | 445 bool IsMouseLocked() const; |
| 448 | 446 |
| 449 // Called each time the browser window is shown. | 447 // Called each time the browser window is shown. |
| 450 void OnWindowDidShow(); | 448 void OnWindowDidShow(); |
| 451 | 449 |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 920 bool window_has_shown_; | 918 bool window_has_shown_; |
| 921 | 919 |
| 922 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 920 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 923 // before DidEndColorChooser is called. | 921 // before DidEndColorChooser is called. |
| 924 scoped_ptr<content::ColorChooser> color_chooser_; | 922 scoped_ptr<content::ColorChooser> color_chooser_; |
| 925 | 923 |
| 926 DISALLOW_COPY_AND_ASSIGN(Browser); | 924 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 927 }; | 925 }; |
| 928 | 926 |
| 929 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 927 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |