| OLD | NEW |
| 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_web_app.h" | 5 #include "chrome/browser/ui/extensions/application_launch_web_app.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "apps/launcher.h" | 9 #include "apps/launcher.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| 11 #include "chrome/browser/app_mode/app_mode_utils.h" | 11 #include "chrome/browser/app_mode/app_mode_utils.h" |
| 12 #include "chrome/browser/extensions/launch_util.h" | 12 #include "chrome/browser/extensions/launch_util.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/browser/ui/browser_commands.h" | 15 #include "chrome/browser/ui/browser_commands.h" |
| 16 #include "chrome/browser/ui/browser_finder.h" | 16 #include "chrome/browser/ui/browser_finder.h" |
| 17 #include "chrome/browser/ui/browser_tabstrip.h" | 17 #include "chrome/browser/ui/browser_tabstrip.h" |
| 18 #include "chrome/browser/ui/browser_window.h" | 18 #include "chrome/browser/ui/browser_window.h" |
| 19 #include "chrome/browser/ui/extensions/app_launch_params.h" | 19 #include "chrome/browser/ui/extensions/app_launch_params.h" |
| 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 21 #include "chrome/browser/web_applications/web_app.h" | 21 #include "chrome/browser/web_applications/web_app.h" |
| 22 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 22 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| 23 #include "content/public/browser/render_view_host.h" | 23 #include "content/public/browser/render_view_host.h" |
| 24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
| 25 #include "content/public/common/renderer_preferences.h" | 25 #include "content/public/common/renderer_preferences.h" |
| 26 #include "extensions/browser/extension_prefs.h" | 26 #include "extensions/browser/extension_prefs.h" |
| 27 #include "extensions/browser/extension_registry.h" | 27 #include "extensions/browser/extension_registry.h" |
| 28 #include "extensions/common/extension.h" | 28 #include "extensions/common/extension.h" |
| 29 #include "ui/base/window_open_disposition.h" | 29 #include "ui/base/window_open_disposition.h" |
| 30 #include "ui/gfx/rect.h" | 30 #include "ui/gfx/geometry/rect.h" |
| 31 | 31 |
| 32 #if defined(OS_MACOSX) | 32 #if defined(OS_MACOSX) |
| 33 #include "chrome/browser/ui/browser_commands_mac.h" | 33 #include "chrome/browser/ui/browser_commands_mac.h" |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 using content::WebContents; | 36 using content::WebContents; |
| 37 using extensions::Extension; | 37 using extensions::Extension; |
| 38 using extensions::ExtensionPrefs; | 38 using extensions::ExtensionPrefs; |
| 39 using extensions::ExtensionRegistry; | 39 using extensions::ExtensionRegistry; |
| 40 | 40 |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 !browser->window()->IsFullscreen()) { | 201 !browser->window()->IsFullscreen()) { |
| 202 #if defined(OS_MACOSX) | 202 #if defined(OS_MACOSX) |
| 203 chrome::ToggleFullscreenWithToolbarOrFallback(browser); | 203 chrome::ToggleFullscreenWithToolbarOrFallback(browser); |
| 204 #else | 204 #else |
| 205 chrome::ToggleFullscreenMode(browser); | 205 chrome::ToggleFullscreenMode(browser); |
| 206 #endif | 206 #endif |
| 207 } | 207 } |
| 208 } | 208 } |
| 209 return contents; | 209 return contents; |
| 210 } | 210 } |
| OLD | NEW |