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

Side by Side Diff: chrome/browser/extensions/api/tabs/tabs_api.cc

Issue 436503002: Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 4 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 | Annotate | Revision Log
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/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
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/extensions/extension_service.h" 26 #include "chrome/browser/extensions/extension_service.h"
27 #include "chrome/browser/extensions/extension_tab_util.h" 27 #include "chrome/browser/extensions/extension_tab_util.h"
28 #include "chrome/browser/extensions/script_executor.h" 28 #include "chrome/browser/extensions/script_executor.h"
29 #include "chrome/browser/extensions/tab_helper.h" 29 #include "chrome/browser/extensions/tab_helper.h"
30 #include "chrome/browser/extensions/window_controller.h" 30 #include "chrome/browser/extensions/window_controller.h"
31 #include "chrome/browser/extensions/window_controller_list.h" 31 #include "chrome/browser/extensions/window_controller_list.h"
32 #include "chrome/browser/prefs/incognito_mode_prefs.h" 32 #include "chrome/browser/prefs/incognito_mode_prefs.h"
33 #include "chrome/browser/profiles/profile.h" 33 #include "chrome/browser/profiles/profile.h"
34 #include "chrome/browser/translate/chrome_translate_client.h" 34 #include "chrome/browser/translate/chrome_translate_client.h"
35 #include "chrome/browser/ui/apps/chrome_app_delegate.h" 35 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
36 #include "chrome/browser/ui/apps/chrome_app_window_delegate.h"
37 #include "chrome/browser/ui/browser.h" 36 #include "chrome/browser/ui/browser.h"
38 #include "chrome/browser/ui/browser_commands.h" 37 #include "chrome/browser/ui/browser_commands.h"
39 #include "chrome/browser/ui/browser_finder.h" 38 #include "chrome/browser/ui/browser_finder.h"
40 #include "chrome/browser/ui/browser_iterator.h" 39 #include "chrome/browser/ui/browser_iterator.h"
41 #include "chrome/browser/ui/browser_navigator.h" 40 #include "chrome/browser/ui/browser_navigator.h"
42 #include "chrome/browser/ui/browser_tabstrip.h" 41 #include "chrome/browser/ui/browser_tabstrip.h"
43 #include "chrome/browser/ui/browser_window.h" 42 #include "chrome/browser/ui/browser_window.h"
44 #include "chrome/browser/ui/host_desktop.h" 43 #include "chrome/browser/ui/host_desktop.h"
45 #include "chrome/browser/ui/panels/panel_manager.h" 44 #include "chrome/browser/ui/panels/panel_manager.h"
46 #include "chrome/browser/ui/tabs/tab_strip_model.h" 45 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 if (create_panel) { 488 if (create_panel) {
490 if (urls.empty()) 489 if (urls.empty())
491 urls.push_back(GURL(chrome::kChromeUINewTabURL)); 490 urls.push_back(GURL(chrome::kChromeUINewTabURL));
492 491
493 #if defined(USE_ASH) 492 #if defined(USE_ASH)
494 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) { 493 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
495 AppWindow::CreateParams create_params; 494 AppWindow::CreateParams create_params;
496 create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL; 495 create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL;
497 create_params.window_spec.bounds = window_bounds; 496 create_params.window_spec.bounds = window_bounds;
498 create_params.focused = saw_focus_key && focused; 497 create_params.focused = saw_focus_key && focused;
499 AppWindow* app_window = new AppWindow(window_profile, 498 AppWindow* app_window =
500 new ChromeAppDelegate(), 499 new AppWindow(window_profile, new ChromeAppDelegate(), extension());
501 new ChromeAppWindowDelegate(),
502 extension());
503 AshPanelContents* ash_panel_contents = new AshPanelContents(app_window); 500 AshPanelContents* ash_panel_contents = new AshPanelContents(app_window);
504 app_window->Init(urls[0], ash_panel_contents, create_params); 501 app_window->Init(urls[0], ash_panel_contents, create_params);
505 SetResult(ash_panel_contents->GetExtensionWindowController() 502 SetResult(ash_panel_contents->GetExtensionWindowController()
506 ->CreateWindowValueWithTabs(extension())); 503 ->CreateWindowValueWithTabs(extension()));
507 return true; 504 return true;
508 } 505 }
509 #endif 506 #endif
510 std::string title = 507 std::string title =
511 web_app::GenerateApplicationNameFromExtensionId(extension_id); 508 web_app::GenerateApplicationNameFromExtensionId(extension_id);
512 // Note: Panels ignore all but the first url provided. 509 // Note: Panels ignore all but the first url provided.
(...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1896 ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode(); 1893 ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode();
1897 api::tabs::ZoomSettings zoom_settings; 1894 api::tabs::ZoomSettings zoom_settings;
1898 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); 1895 ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
1899 1896
1900 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); 1897 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
1901 SendResponse(true); 1898 SendResponse(true);
1902 return true; 1899 return true;
1903 } 1900 }
1904 1901
1905 } // namespace extensions 1902 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/app_window/app_window_api.cc ('k') | chrome/browser/ui/apps/chrome_app_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698