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 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 } | 467 } |
468 | 468 |
469 extensions::WindowController* extension_window_controller() const { | 469 extensions::WindowController* extension_window_controller() const { |
470 return extension_window_controller_.get(); | 470 return extension_window_controller_.get(); |
471 } | 471 } |
472 | 472 |
473 private: | 473 private: |
474 friend class BrowserTest; | 474 friend class BrowserTest; |
475 friend class FullscreenControllerInteractiveTest; | 475 friend class FullscreenControllerInteractiveTest; |
476 friend class FullscreenControllerTest; | 476 friend class FullscreenControllerTest; |
| 477 friend class TabAudioIndicatorTest; |
477 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); | 478 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
478 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, | 479 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, |
479 IsReservedCommandOrKeyIsApp); | 480 IsReservedCommandOrKeyIsApp); |
480 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); | 481 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); |
481 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 482 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
482 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 483 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
483 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); | 484 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); |
484 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 485 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
485 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | 486 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, |
486 TabEntersPresentationModeFromWindowed); | 487 TabEntersPresentationModeFromWindowed); |
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
927 bool window_has_shown_; | 928 bool window_has_shown_; |
928 | 929 |
929 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 930 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
930 // before DidEndColorChooser is called. | 931 // before DidEndColorChooser is called. |
931 scoped_ptr<content::ColorChooser> color_chooser_; | 932 scoped_ptr<content::ColorChooser> color_chooser_; |
932 | 933 |
933 DISALLOW_COPY_AND_ASSIGN(Browser); | 934 DISALLOW_COPY_AND_ASSIGN(Browser); |
934 }; | 935 }; |
935 | 936 |
936 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 937 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |