| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/launcher.h" | 5 #include "apps/launcher.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 #include "base/memory/scoped_ptr.h" | 56 #include "base/memory/scoped_ptr.h" |
| 57 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 57 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
| 58 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 58 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
| 59 #include "chromeos/dbus/dbus_thread_manager.h" | 59 #include "chromeos/dbus/dbus_thread_manager.h" |
| 60 #include "chromeos/dbus/fake_power_manager_client.h" | 60 #include "chromeos/dbus/fake_power_manager_client.h" |
| 61 #endif | 61 #endif |
| 62 | 62 |
| 63 using content::WebContents; | 63 using content::WebContents; |
| 64 using web_modal::WebContentsModalDialogManager; | 64 using web_modal::WebContentsModalDialogManager; |
| 65 | 65 |
| 66 namespace app_runtime = extensions::core_api::app_runtime; | 66 namespace app_runtime = extensions::api::app_runtime; |
| 67 | 67 |
| 68 namespace extensions { | 68 namespace extensions { |
| 69 | 69 |
| 70 namespace { | 70 namespace { |
| 71 | 71 |
| 72 // Non-abstract RenderViewContextMenu class. | 72 // Non-abstract RenderViewContextMenu class. |
| 73 class PlatformAppContextMenu : public RenderViewContextMenu { | 73 class PlatformAppContextMenu : public RenderViewContextMenu { |
| 74 public: | 74 public: |
| 75 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host, | 75 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host, |
| 76 const content::ContextMenuParams& params) | 76 const content::ContextMenuParams& params) |
| (...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1372 // Now check that the app window's default zoom, and actual zoom level, | 1372 // Now check that the app window's default zoom, and actual zoom level, |
| 1373 // have not been changed from the default. | 1373 // have not been changed from the default. |
| 1374 WebContents* web_contents = GetFirstAppWindowWebContents(); | 1374 WebContents* web_contents = GetFirstAppWindowWebContents(); |
| 1375 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( | 1375 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( |
| 1376 web_contents->GetSiteInstance()); | 1376 web_contents->GetSiteInstance()); |
| 1377 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); | 1377 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); |
| 1378 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); | 1378 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); |
| 1379 } | 1379 } |
| 1380 | 1380 |
| 1381 } // namespace extensions | 1381 } // namespace extensions |
| OLD | NEW |