| 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/extensions/api/tabs/tabs_api.h" | 5 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/location.h" | 13 #include "base/location.h" |
| 14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/memory/ref_counted_memory.h" | 15 #include "base/memory/ref_counted_memory.h" |
| 16 #include "base/prefs/pref_service.h" | 16 #include "base/prefs/pref_service.h" |
| 17 #include "base/single_thread_task_runner.h" | 17 #include "base/single_thread_task_runner.h" |
| 18 #include "base/stl_util.h" | 18 #include "base/stl_util.h" |
| 19 #include "base/strings/pattern.h" | 19 #include "base/strings/pattern.h" |
| 20 #include "base/strings/string16.h" | 20 #include "base/strings/string16.h" |
| 21 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
| 22 #include "base/strings/string_util.h" | 22 #include "base/strings/string_util.h" |
| 23 #include "base/strings/stringprintf.h" | 23 #include "base/strings/stringprintf.h" |
| 24 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
| 25 #include "base/thread_task_runner_handle.h" | 25 #include "base/thread_task_runner_handle.h" |
| 26 #include "chrome/browser/apps/scoped_keep_alive.h" | |
| 27 #include "chrome/browser/chrome_notification_types.h" | 26 #include "chrome/browser/chrome_notification_types.h" |
| 28 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 27 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
| 29 #include "chrome/browser/extensions/api/tabs/windows_util.h" | 28 #include "chrome/browser/extensions/api/tabs/windows_util.h" |
| 30 #include "chrome/browser/extensions/extension_service.h" | 29 #include "chrome/browser/extensions/extension_service.h" |
| 31 #include "chrome/browser/extensions/extension_tab_util.h" | 30 #include "chrome/browser/extensions/extension_tab_util.h" |
| 32 #include "chrome/browser/extensions/tab_helper.h" | 31 #include "chrome/browser/extensions/tab_helper.h" |
| 33 #include "chrome/browser/extensions/window_controller.h" | 32 #include "chrome/browser/extensions/window_controller.h" |
| 34 #include "chrome/browser/extensions/window_controller_list.h" | 33 #include "chrome/browser/extensions/window_controller_list.h" |
| 34 #include "chrome/browser/lifetime/browser_keep_alive.h" |
| 35 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 35 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 36 #include "chrome/browser/profiles/profile.h" | 36 #include "chrome/browser/profiles/profile.h" |
| 37 #include "chrome/browser/sessions/session_tab_helper.h" | 37 #include "chrome/browser/sessions/session_tab_helper.h" |
| 38 #include "chrome/browser/translate/chrome_translate_client.h" | 38 #include "chrome/browser/translate/chrome_translate_client.h" |
| 39 #include "chrome/browser/ui/apps/chrome_app_delegate.h" | 39 #include "chrome/browser/ui/apps/chrome_app_delegate.h" |
| 40 #include "chrome/browser/ui/browser.h" | 40 #include "chrome/browser/ui/browser.h" |
| 41 #include "chrome/browser/ui/browser_commands.h" | 41 #include "chrome/browser/ui/browser_commands.h" |
| 42 #include "chrome/browser/ui/browser_finder.h" | 42 #include "chrome/browser/ui/browser_finder.h" |
| 43 #include "chrome/browser/ui/browser_iterator.h" | 43 #include "chrome/browser/ui/browser_iterator.h" |
| 44 #include "chrome/browser/ui/browser_navigator.h" | 44 #include "chrome/browser/ui/browser_navigator.h" |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 | 583 |
| 584 #if defined(USE_ASH) | 584 #if defined(USE_ASH) |
| 585 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) { | 585 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) { |
| 586 AppWindow::CreateParams create_params; | 586 AppWindow::CreateParams create_params; |
| 587 create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL; | 587 create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL; |
| 588 create_params.window_key = extension_id; | 588 create_params.window_key = extension_id; |
| 589 create_params.window_spec.bounds = window_bounds; | 589 create_params.window_spec.bounds = window_bounds; |
| 590 create_params.focused = saw_focus_key && focused; | 590 create_params.focused = saw_focus_key && focused; |
| 591 AppWindow* app_window = new AppWindow( | 591 AppWindow* app_window = new AppWindow( |
| 592 window_profile, | 592 window_profile, |
| 593 new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)), | 593 new ChromeAppDelegate( |
| 594 make_scoped_ptr(new browser_lifetime::ScopedKeepAlive)), |
| 594 extension()); | 595 extension()); |
| 595 AshPanelContents* ash_panel_contents = new AshPanelContents(app_window); | 596 AshPanelContents* ash_panel_contents = new AshPanelContents(app_window); |
| 596 app_window->Init(urls[0], ash_panel_contents, create_params); | 597 app_window->Init(urls[0], ash_panel_contents, create_params); |
| 597 WindowController* window_controller = | 598 WindowController* window_controller = |
| 598 WindowControllerList::GetInstance()->FindWindowById( | 599 WindowControllerList::GetInstance()->FindWindowById( |
| 599 app_window->session_id().id()); | 600 app_window->session_id().id()); |
| 600 if (!window_controller) | 601 if (!window_controller) |
| 601 return false; | 602 return false; |
| 602 SetResult(window_controller->CreateWindowValueWithTabs(extension())); | 603 SetResult(window_controller->CreateWindowValueWithTabs(extension())); |
| 603 return true; | 604 return true; |
| (...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2049 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); | 2050 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); |
| 2050 zoom_settings.default_zoom_factor.reset(new double( | 2051 zoom_settings.default_zoom_factor.reset(new double( |
| 2051 content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel()))); | 2052 content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel()))); |
| 2052 | 2053 |
| 2053 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); | 2054 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); |
| 2054 SendResponse(true); | 2055 SendResponse(true); |
| 2055 return true; | 2056 return true; |
| 2056 } | 2057 } |
| 2057 | 2058 |
| 2058 } // namespace extensions | 2059 } // namespace extensions |
| OLD | NEW |