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

Side by Side Diff: components/html_viewer/html_frame_tree_manager.cc

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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
« no previous file with comments | « components/html_viewer/html_frame_apptest.cc ('k') | components/html_viewer/html_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "components/html_viewer/html_frame_tree_manager.h" 5 #include "components/html_viewer/html_frame_tree_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "components/html_viewer/blink_basic_type_converters.h" 11 #include "components/html_viewer/blink_basic_type_converters.h"
12 #include "components/html_viewer/blink_url_request_type_converters.h" 12 #include "components/html_viewer/blink_url_request_type_converters.h"
13 #include "components/html_viewer/document_resource_waiter.h" 13 #include "components/html_viewer/document_resource_waiter.h"
14 #include "components/html_viewer/global_state.h" 14 #include "components/html_viewer/global_state.h"
15 #include "components/html_viewer/html_factory.h" 15 #include "components/html_viewer/html_factory.h"
16 #include "components/html_viewer/html_frame.h" 16 #include "components/html_viewer/html_frame.h"
17 #include "components/html_viewer/html_frame_delegate.h" 17 #include "components/html_viewer/html_frame_delegate.h"
18 #include "components/html_viewer/html_frame_tree_manager_observer.h" 18 #include "components/html_viewer/html_frame_tree_manager_observer.h"
19 #include "components/view_manager/public/cpp/view_tree_connection.h" 19 #include "components/mus/public/cpp/view_tree_connection.h"
20 #include "components/web_view/web_view_switches.h" 20 #include "components/web_view/web_view_switches.h"
21 #include "third_party/WebKit/public/web/WebLocalFrame.h" 21 #include "third_party/WebKit/public/web/WebLocalFrame.h"
22 #include "third_party/WebKit/public/web/WebRemoteFrame.h" 22 #include "third_party/WebKit/public/web/WebRemoteFrame.h"
23 #include "third_party/WebKit/public/web/WebTreeScopeType.h" 23 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
24 #include "third_party/WebKit/public/web/WebView.h" 24 #include "third_party/WebKit/public/web/WebView.h"
25 #include "ui/gfx/geometry/dip_util.h" 25 #include "ui/gfx/geometry/dip_util.h"
26 #include "ui/gfx/geometry/size.h" 26 #include "ui/gfx/geometry/size.h"
27 27
28 namespace html_viewer { 28 namespace html_viewer {
29 namespace { 29 namespace {
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 mojo::Array<uint8_t> new_data) { 355 mojo::Array<uint8_t> new_data) {
356 if (source != local_root_) 356 if (source != local_root_)
357 return; 357 return;
358 358
359 HTMLFrame* frame = root_->FindFrame(frame_id); 359 HTMLFrame* frame = root_->FindFrame(frame_id);
360 if (frame) 360 if (frame)
361 frame->SetValueFromClientProperty(name, new_data.Pass()); 361 frame->SetValueFromClientProperty(name, new_data.Pass());
362 } 362 }
363 363
364 } // namespace mojo 364 } // namespace mojo
OLDNEW
« no previous file with comments | « components/html_viewer/html_frame_apptest.cc ('k') | components/html_viewer/html_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698