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

Side by Side Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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) 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 #include "chrome/browser/ui/extensions/application_launch.h" 5 #include "chrome/browser/ui/extensions/application_launch.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "chrome/browser/extensions/default_apps_trial.h" 10 #include "chrome/browser/extensions/default_apps_trial.h"
(...skipping 24 matching lines...) Expand all
35 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 35 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
36 #endif 36 #endif
37 37
38 #if defined(USE_ASH) 38 #if defined(USE_ASH)
39 #include "ash/ash_switches.h" 39 #include "ash/ash_switches.h"
40 #include "chrome/browser/ui/views/ash/panel_view_aura.h" 40 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
41 #endif 41 #endif
42 42
43 using content::WebContents; 43 using content::WebContents;
44 using extensions::Extension; 44 using extensions::Extension;
45 using extensions::ExtensionPrefs;
45 46
46 namespace { 47 namespace {
47 48
48 // Get the launch URL for a given extension, with optional override/fallback. 49 // Get the launch URL for a given extension, with optional override/fallback.
49 // |override_url|, if non-empty, will be preferred over the extension's 50 // |override_url|, if non-empty, will be preferred over the extension's
50 // launch url. 51 // launch url.
51 GURL UrlForExtension(const Extension* extension, 52 GURL UrlForExtension(const Extension* extension,
52 const GURL& override_url) { 53 const GURL& override_url) {
53 if (!extension) 54 if (!extension)
54 return override_url; 55 return override_url;
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN && 344 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN &&
344 !browser->window()->IsFullscreen()) { 345 !browser->window()->IsFullscreen()) {
345 browser->ToggleFullscreenMode(); 346 browser->ToggleFullscreenMode();
346 } 347 }
347 #endif 348 #endif
348 349
349 return contents; 350 return contents;
350 } 351 }
351 352
352 } // namespace application_launch 353 } // namespace application_launch
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698