| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 5230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5241 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? | 5241 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? |
| 5242 BookmarkBar::ANIMATE_STATE_CHANGE : | 5242 BookmarkBar::ANIMATE_STATE_CHANGE : |
| 5243 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; | 5243 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; |
| 5244 window_->BookmarkBarStateChanged(animate_type); | 5244 window_->BookmarkBarStateChanged(animate_type); |
| 5245 } | 5245 } |
| 5246 | 5246 |
| 5247 void Browser::ShowSyncSetup() { | 5247 void Browser::ShowSyncSetup() { |
| 5248 ProfileSyncService* service = | 5248 ProfileSyncService* service = |
| 5249 profile()->GetOriginalProfile()->GetProfileSyncService(); | 5249 profile()->GetOriginalProfile()->GetProfileSyncService(); |
| 5250 if (service->HasSyncSetupCompleted()) | 5250 if (service->HasSyncSetupCompleted()) |
| 5251 ShowOptionsTab(chrome::kSyncSetupSubPage); | 5251 ShowOptionsTab(chrome::kPersonalOptionsSubPage); |
| 5252 else | 5252 else |
| 5253 service->ShowLoginDialog(); | 5253 service->ShowLoginDialog(); |
| 5254 } | 5254 } |
| 5255 | 5255 |
| 5256 void Browser::ToggleSpeechInput() { | 5256 void Browser::ToggleSpeechInput() { |
| 5257 GetSelectedTabContentsWrapper()->render_view_host()->ToggleSpeechInput(); | 5257 GetSelectedTabContentsWrapper()->render_view_host()->ToggleSpeechInput(); |
| 5258 } | 5258 } |
| 5259 | 5259 |
| 5260 void Browser::OnWindowDidShow() { | 5260 void Browser::OnWindowDidShow() { |
| 5261 if (window_has_shown_) | 5261 if (window_has_shown_) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 5282 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5282 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
| 5283 } else if (is_type_tabbed()) { | 5283 } else if (is_type_tabbed()) { |
| 5284 GlobalErrorService* service = | 5284 GlobalErrorService* service = |
| 5285 GlobalErrorServiceFactory::GetForProfile(profile()); | 5285 GlobalErrorServiceFactory::GetForProfile(profile()); |
| 5286 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5286 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
| 5287 if (error) { | 5287 if (error) { |
| 5288 error->ShowBubbleView(this); | 5288 error->ShowBubbleView(this); |
| 5289 } | 5289 } |
| 5290 } | 5290 } |
| 5291 } | 5291 } |
| OLD | NEW |