summaryrefslogtreecommitdiffstats
path: root/blimp/client/session
diff options
context:
space:
mode:
authorhaibinlu <haibinlu@chromium.org>2016-01-08 11:10:29 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-08 19:11:37 +0000
commit741ac2ea859e26c52947cc49ecea6d976f622517 (patch)
tree7c3b2b9cd45d0dc0e75a401c1e5785b580177296 /blimp/client/session
parent45330a07763ff4c55a7ad05439296a25eee10e9f (diff)
downloadchromium_src-741ac2ea859e26c52947cc49ecea6d976f622517.zip
chromium_src-741ac2ea859e26c52947cc49ecea6d976f622517.tar.gz
chromium_src-741ac2ea859e26c52947cc49ecea6d976f622517.tar.bz2
Engine sends RenderWidgetInitialized message WebContents swaps its visible RenderViewHost with another one.
Merges size.proto into tab_control.proto to avoid compiler issue with cc/proto/size.proto. Also adds a few debug logs. Review URL: https://codereview.chromium.org/1566803003 Cr-Commit-Position: refs/heads/master@{#368396}
Diffstat (limited to 'blimp/client/session')
-rw-r--r--blimp/client/session/tab_control_feature.cc1
-rw-r--r--blimp/client/session/tab_control_feature_unittest.cc1
2 files changed, 0 insertions, 2 deletions
diff --git a/blimp/client/session/tab_control_feature.cc b/blimp/client/session/tab_control_feature.cc
index 5b1ccd9..e46cbd3 100644
--- a/blimp/client/session/tab_control_feature.cc
+++ b/blimp/client/session/tab_control_feature.cc
@@ -6,7 +6,6 @@
#include "blimp/common/create_blimp_message.h"
#include "blimp/common/proto/blimp_message.pb.h"
-#include "blimp/common/proto/size.pb.h"
#include "blimp/common/proto/tab_control.pb.h"
#include "blimp/net/blimp_message_processor.h"
diff --git a/blimp/client/session/tab_control_feature_unittest.cc b/blimp/client/session/tab_control_feature_unittest.cc
index 8c60e2cc..c93b2c6 100644
--- a/blimp/client/session/tab_control_feature_unittest.cc
+++ b/blimp/client/session/tab_control_feature_unittest.cc
@@ -7,7 +7,6 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "blimp/common/proto/blimp_message.pb.h"
-#include "blimp/common/proto/size.pb.h"
#include "blimp/common/proto/tab_control.pb.h"
#include "blimp/net/test_common.h"
#include "net/base/net_errors.h"