summaryrefslogtreecommitdiffstats
path: root/chrome/browser/speech
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 20:26:10 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 20:26:10 +0000
commit8643e6d85c2a41d6497d5cb9b69bea9465102e96 (patch)
tree59f2ce5b54122410f6200f69bbb3144d19ed02bd /chrome/browser/speech
parent16128cf279e5523eac781a97600ef7d9773aa2c5 (diff)
downloadchromium_src-8643e6d85c2a41d6497d5cb9b69bea9465102e96.zip
chromium_src-8643e6d85c2a41d6497d5cb9b69bea9465102e96.tar.gz
chromium_src-8643e6d85c2a41d6497d5cb9b69bea9465102e96.tar.bz2
Rename TabContentsView to WebContentsView and move to content/public.
Also rename TestTabContentsView to TestWebContentsView. Add content namespace to both. TBR=owners (trivial updates) BUG=98716 Review URL: http://codereview.chromium.org/9241011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
-rw-r--r--chrome/browser/speech/speech_input_bubble_mac.mm4
-rw-r--r--chrome/browser/speech/speech_input_bubble_views.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/speech/speech_input_bubble_mac.mm b/chrome/browser/speech/speech_input_bubble_mac.mm
index d2fcedd..53ea4b6 100644
--- a/chrome/browser/speech/speech_input_bubble_mac.mm
+++ b/chrome/browser/speech/speech_input_bubble_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,8 +12,8 @@
#include "chrome/browser/ui/cocoa/browser_window_controller.h"
#include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
#import "chrome/browser/ui/cocoa/speech_input_window_controller.h"
-#include "content/browser/tab_contents/tab_contents_view.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
#include "skia/ext/skia_utils_mac.h"
using content::WebContents;
diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc
index 5cad3ff..9c07860 100644
--- a/chrome/browser/speech/speech_input_bubble_views.cc
+++ b/chrome/browser/speech/speech_input_bubble_views.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -14,8 +14,8 @@
#include "chrome/browser/ui/views/window.h"
#include "content/browser/resource_context.h"
#include "content/browser/speech/speech_input_manager.h"
-#include "content/browser/tab_contents/tab_contents_view.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"