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