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

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

Issue 3149029: Remove TYPE_EXTENSION_APP. Experiment failed. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: restored change to tab_strip_model.h Created 10 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_H_
6 #define CHROME_BROWSER_BROWSER_H_ 6 #define CHROME_BROWSER_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 public ProfileSyncServiceObserver { 54 public ProfileSyncServiceObserver {
55 public: 55 public:
56 // If you change the values in this enum you'll need to update browser_proxy. 56 // If you change the values in this enum you'll need to update browser_proxy.
57 // TODO(sky): move into a common place that is referenced by both ui_tests 57 // TODO(sky): move into a common place that is referenced by both ui_tests
58 // and chrome. 58 // and chrome.
59 enum Type { 59 enum Type {
60 TYPE_NORMAL = 1, 60 TYPE_NORMAL = 1,
61 TYPE_POPUP = 2, 61 TYPE_POPUP = 2,
62 // The old-style app created via "Create application shortcuts". 62 // The old-style app created via "Create application shortcuts".
63 TYPE_APP = 4, 63 TYPE_APP = 4,
64 // The new-style app created by installing a crx. This kinda needs to be
65 // separate because we require larger icons and an application name that
66 // are found in the crx. If we ever decide to create this kind of app using
67 // some other system (eg some web standard), maybe we should generalize this
68 // name to TYPE_MULTITAB or something.
69 TYPE_EXTENSION_APP = 8,
70 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP, 64 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP,
71 TYPE_DEVTOOLS = TYPE_APP | 16, 65 TYPE_DEVTOOLS = TYPE_APP | 16,
72 TYPE_APP_PANEL = TYPE_APP | 32, 66 TYPE_APP_PANEL = TYPE_APP | 32,
73 TYPE_ANY = TYPE_NORMAL | 67 TYPE_ANY = TYPE_NORMAL |
74 TYPE_POPUP | 68 TYPE_POPUP |
75 TYPE_APP | 69 TYPE_APP |
76 TYPE_EXTENSION_APP |
77 TYPE_DEVTOOLS | 70 TYPE_DEVTOOLS |
78 TYPE_APP_PANEL 71 TYPE_APP_PANEL
79 }; 72 };
80 73
81 // Possible elements of the Browser window. 74 // Possible elements of the Browser window.
82 enum WindowFeature { 75 enum WindowFeature {
83 FEATURE_NONE = 0, 76 FEATURE_NONE = 0,
84 FEATURE_TITLEBAR = 1, 77 FEATURE_TITLEBAR = 1,
85 FEATURE_TABSTRIP = 2, 78 FEATURE_TABSTRIP = 2,
86 FEATURE_TOOLBAR = 4, 79 FEATURE_TOOLBAR = 4,
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 mutable BooleanPrefMember use_vertical_tabs_; 1074 mutable BooleanPrefMember use_vertical_tabs_;
1082 1075
1083 // The profile's tab restore service. The service is owned by the profile, 1076 // The profile's tab restore service. The service is owned by the profile,
1084 // and we install ourselves as an observer. 1077 // and we install ourselves as an observer.
1085 TabRestoreService* tab_restore_service_; 1078 TabRestoreService* tab_restore_service_;
1086 1079
1087 DISALLOW_COPY_AND_ASSIGN(Browser); 1080 DISALLOW_COPY_AND_ASSIGN(Browser);
1088 }; 1081 };
1089 1082
1090 #endif // CHROME_BROWSER_BROWSER_H_ 1083 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698