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

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

Issue 10383114: Rename BrowserInit to StartupBrowserCreator, and move into startup subdir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/tabs/pinned_tab_test_utils.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 894
895 private: 895 private:
896 friend class BrowserTest; 896 friend class BrowserTest;
897 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); 897 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
898 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); 898 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
899 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); 899 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
900 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); 900 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
901 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); 901 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
902 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed); 902 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
903 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, 903 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest,
904 DenyExitsFullscreen); 904 DenyExitsFullscreen);
905 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref); 905 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref);
906 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref); 906 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
907 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref); 907 OpenAppShortcutWindowPref);
908 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel); 908 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref);
909 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutPanel);
909 910
910 // Used to describe why a tab is being detached. This is used by 911 // Used to describe why a tab is being detached. This is used by
911 // TabDetachedAtImpl. 912 // TabDetachedAtImpl.
912 enum DetachType { 913 enum DetachType {
913 // Result of TabDetachedAt. 914 // Result of TabDetachedAt.
914 DETACH_TYPE_DETACH, 915 DETACH_TYPE_DETACH,
915 916
916 // Result of TabReplacedAt. 917 // Result of TabReplacedAt.
917 DETACH_TYPE_REPLACE, 918 DETACH_TYPE_REPLACE,
918 919
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1481 bool window_has_shown_; 1482 bool window_has_shown_;
1482 1483
1483 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1484 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1484 // before DidEndColorChooser is called. 1485 // before DidEndColorChooser is called.
1485 scoped_ptr<content::ColorChooser> color_chooser_; 1486 scoped_ptr<content::ColorChooser> color_chooser_;
1486 1487
1487 DISALLOW_COPY_AND_ASSIGN(Browser); 1488 DISALLOW_COPY_AND_ASSIGN(Browser);
1488 }; 1489 };
1489 1490
1490 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1491 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/tabs/pinned_tab_test_utils.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698