| 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 "extensions/browser/api/app_window/app_window_api.h" | 5 #include "extensions/browser/api/app_window/app_window_api.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 // PlzNavigate: delay sending the response until the newly created window has | 397 // PlzNavigate: delay sending the response until the newly created window has |
| 398 // been told to navigate, and blink has been correctly initialized in the | 398 // been told to navigate, and blink has been correctly initialized in the |
| 399 // renderer. | 399 // renderer. |
| 400 if (content::IsBrowserSideNavigationEnabled()) { | 400 if (content::IsBrowserSideNavigationEnabled()) { |
| 401 app_window->SetOnFirstCommitCallback( | 401 app_window->SetOnFirstCommitCallback( |
| 402 base::Bind(&AppWindowCreateFunction::SendResponse, this, true)); | 402 base::Bind(&AppWindowCreateFunction::SendResponse, this, true)); |
| 403 return true; | 403 return true; |
| 404 } | 404 } |
| 405 | 405 |
| 406 SendResponse(true); | 406 SendResponse(true); |
| 407 app_window->WindowEventsReady(); | |
| 408 | 407 |
| 409 return true; | 408 return true; |
| 410 } | 409 } |
| 411 | 410 |
| 412 bool AppWindowCreateFunction::GetBoundsSpec( | 411 bool AppWindowCreateFunction::GetBoundsSpec( |
| 413 const app_window::CreateWindowOptions& options, | 412 const app_window::CreateWindowOptions& options, |
| 414 AppWindow::CreateParams* params, | 413 AppWindow::CreateParams* params, |
| 415 std::string* error) { | 414 std::string* error) { |
| 416 DCHECK(params); | 415 DCHECK(params); |
| 417 DCHECK(error); | 416 DCHECK(error); |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 | 574 |
| 576 if (options.frame->as_frame_options->inactive_color.get()) { | 575 if (options.frame->as_frame_options->inactive_color.get()) { |
| 577 error_ = app_window_constants::kInactiveColorWithoutColor; | 576 error_ = app_window_constants::kInactiveColorWithoutColor; |
| 578 return false; | 577 return false; |
| 579 } | 578 } |
| 580 | 579 |
| 581 return true; | 580 return true; |
| 582 } | 581 } |
| 583 | 582 |
| 584 } // namespace extensions | 583 } // namespace extensions |
| OLD | NEW |