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

Side by Side Diff: chrome/browser/extensions/launch_util.cc

Issue 196423023: Revert of Include sync.pb.h in sync_data.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "chrome/browser/extensions/launch_util.h" 5 #include "chrome/browser/extensions/launch_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_sync_service.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/host_desktop.h" 11 #include "chrome/browser/ui/host_desktop.h"
13 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/extensions/extension_constants.h" 13 #include "chrome/common/extensions/extension_constants.h"
15 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 14 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
16 #include "components/user_prefs/pref_registry_syncable.h" 15 #include "components/user_prefs/pref_registry_syncable.h"
17 #include "extensions/browser/extension_prefs.h" 16 #include "extensions/browser/extension_prefs.h"
18 #include "extensions/browser/pref_names.h" 17 #include "extensions/browser/pref_names.h"
19 #include "extensions/common/extension.h" 18 #include "extensions/common/extension.h"
20 19
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs, 159 bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs,
161 const Extension* extension) { 160 const Extension* extension) {
162 int value = -1; 161 int value = -1;
163 LaunchContainer manifest_launch_container = 162 LaunchContainer manifest_launch_container =
164 AppLaunchInfo::GetLaunchContainer(extension); 163 AppLaunchInfo::GetLaunchContainer(extension);
165 return manifest_launch_container == LAUNCH_CONTAINER_TAB && 164 return manifest_launch_container == LAUNCH_CONTAINER_TAB &&
166 prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value); 165 prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value);
167 } 166 }
168 167
169 } // namespace extensions 168 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/history/top_sites.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698