| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mandoline/ui/browser/browser.h" | 5 #include "mandoline/ui/browser/browser.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "components/view_manager/public/cpp/view.h" | 9 #include "components/view_manager/public/cpp/view.h" |
| 10 #include "components/view_manager/public/cpp/view_manager_init.h" | 10 #include "components/view_manager/public/cpp/view_manager_init.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 frame_tree_.reset(new FrameTree(content_, this, frame_tree_client, | 179 frame_tree_.reset(new FrameTree(content_, this, frame_tree_client, |
| 180 frame_connection.Pass())); | 180 frame_connection.Pass())); |
| 181 content_->Embed(view_manager_client.Pass()); | 181 content_->Embed(view_manager_client.Pass()); |
| 182 LoadingStateChanged(true); | 182 LoadingStateChanged(true); |
| 183 | 183 |
| 184 navigator_host_.RecordNavigation(gurl.spec()); | 184 navigator_host_.RecordNavigation(gurl.spec()); |
| 185 } | 185 } |
| 186 | 186 |
| 187 bool Browser::CanPostMessageEventToFrame(const Frame* source, | 187 bool Browser::CanPostMessageEventToFrame(const Frame* source, |
| 188 const Frame* target, | 188 const Frame* target, |
| 189 MessageEvent* event) { | 189 HTMLMessageEvent* event) { |
| 190 return true; | 190 return true; |
| 191 } | 191 } |
| 192 | 192 |
| 193 void Browser::LoadingStateChanged(bool loading) { | 193 void Browser::LoadingStateChanged(bool loading) { |
| 194 ui_->LoadingStateChanged(loading); | 194 ui_->LoadingStateChanged(loading); |
| 195 } | 195 } |
| 196 | 196 |
| 197 void Browser::ProgressChanged(double progress) { | 197 void Browser::ProgressChanged(double progress) { |
| 198 ui_->ProgressChanged(progress); | 198 ui_->ProgressChanged(progress); |
| 199 } | 199 } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 NavigateExistingFrame(target_frame, request.Pass()); | 234 NavigateExistingFrame(target_frame, request.Pass()); |
| 235 return; | 235 return; |
| 236 } | 236 } |
| 237 DVLOG(1) << "RequestNavigate() targeted existing frame that doesn't exist."; | 237 DVLOG(1) << "RequestNavigate() targeted existing frame that doesn't exist."; |
| 238 return; | 238 return; |
| 239 } | 239 } |
| 240 ReplaceContentWithRequest(request.Pass()); | 240 ReplaceContentWithRequest(request.Pass()); |
| 241 } | 241 } |
| 242 | 242 |
| 243 } // namespace mandoline | 243 } // namespace mandoline |
| OLD | NEW |