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

Side by Side Diff: chrome/browser/ui/views/ash/launcher/launcher_updater.h

Issue 9692021: Revert 126256 - Show a different icon in the launcher for incognito windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
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_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 TabStripModel* tab_model_; 128 TabStripModel* tab_model_;
129 129
130 ChromeLauncherDelegate* launcher_delegate_; 130 ChromeLauncherDelegate* launcher_delegate_;
131 131
132 // Whether this corresponds to an app or tabbed browser. 132 // Whether this corresponds to an app or tabbed browser.
133 const Type type_; 133 const Type type_;
134 134
135 const std::string app_id_; 135 const std::string app_id_;
136 136
137 // Whether the is associated with an incognito profile.
138 const bool is_incognito_;
139
140 // This is one of three possible values: 137 // This is one of three possible values:
141 // . If type_ == TYPE_APP, this is the ID of the app item. 138 // . If type_ == TYPE_APP, this is the ID of the app item.
142 // . If type_ == TYPE_TABBED and all the tabs are app tabs this is -1. 139 // . If type_ == TYPE_TABBED and all the tabs are app tabs this is -1.
143 // . Otherwise this is the id of the TYPE_TABBED item. 140 // . Otherwise this is the id of the TYPE_TABBED item.
144 ash::LauncherID item_id_; 141 ash::LauncherID item_id_;
145 142
146 // Used for any app tabs. 143 // Used for any app tabs.
147 AppTabMap app_map_; 144 AppTabMap app_map_;
148 145
149 DISALLOW_COPY_AND_ASSIGN(LauncherUpdater); 146 DISALLOW_COPY_AND_ASSIGN(LauncherUpdater);
150 }; 147 };
151 148
152 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_ 149 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_UPDATER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698