summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/automation/automation_provider.cc1
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_mac.mm4
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 79e384e..67dc491 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -2618,7 +2618,6 @@ TabContents* AutomationProvider::GetTabContentsForHandle(
int handle, NavigationController** tab) {
if (tab_tracker_->ContainsHandle(handle)) {
NavigationController* nav_controller = tab_tracker_->GetResource(handle);
- TabContents* tab_contents = nav_controller->tab_contents();
if (tab)
*tab = nav_controller;
return nav_controller->tab_contents();
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index 97cbf68..adc9e22 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -182,14 +182,14 @@ void TabContentsViewMac::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
switch (type.value) {
- case NotificationType::tab_contents_CONNECTED: {
+ case NotificationType::TAB_CONTENTS_CONNECTED: {
if (sad_tab_.get()) {
[sad_tab_.get() removeFromSuperview];
sad_tab_.reset();
}
break;
}
- case NotificationType::tab_contents_DISCONNECTED: {
+ case NotificationType::TAB_CONTENTS_DISCONNECTED: {
SadTabView* view = [[SadTabView alloc] initWithFrame:NSZeroRect];
sad_tab_.reset(view);