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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 9875028: Reverting due to memory (Valgrind) errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 } 497 }
498 498
499 // There may be pending file dialogs, we need to tell them that we've gone 499 // There may be pending file dialogs, we need to tell them that we've gone
500 // away so they don't try and call back to us. 500 // away so they don't try and call back to us.
501 if (select_file_dialog_.get()) 501 if (select_file_dialog_.get())
502 select_file_dialog_->ListenerDestroyed(); 502 select_file_dialog_->ListenerDestroyed();
503 503
504 TabRestoreServiceDestroyed(tab_restore_service_); 504 TabRestoreServiceDestroyed(tab_restore_service_);
505 } 505 }
506 506
507 bool Browser::IsFullscreenForTabOrPending() const { 507 bool Browser::IsFullscreenForTab() const {
508 return fullscreen_controller_->IsFullscreenForTabOrPending(); 508 return fullscreen_controller_->IsFullscreenForTab();
509 }
510
511 bool Browser::IsMouseLockedOrPending() const {
512 return fullscreen_controller_->IsMouseLockedOrPending();
513 } 509 }
514 510
515 // static 511 // static
516 Browser* Browser::Create(Profile* profile) { 512 Browser* Browser::Create(Profile* profile) {
517 Browser* browser = new Browser(TYPE_TABBED, profile); 513 Browser* browser = new Browser(TYPE_TABBED, profile);
518 browser->InitBrowserWindow(); 514 browser->InitBrowserWindow();
519 return browser; 515 return browser;
520 } 516 }
521 517
522 // static 518 // static
(...skipping 3668 matching lines...) Expand 10 before | Expand all | Expand 10 after
4191 void Browser::EnumerateDirectory(WebContents* tab, int request_id, 4187 void Browser::EnumerateDirectory(WebContents* tab, int request_id,
4192 const FilePath& path) { 4188 const FilePath& path) {
4193 EnumerateDirectoryHelper(tab, request_id, path); 4189 EnumerateDirectoryHelper(tab, request_id, path);
4194 } 4190 }
4195 4191
4196 void Browser::ToggleFullscreenModeForTab(WebContents* tab, 4192 void Browser::ToggleFullscreenModeForTab(WebContents* tab,
4197 bool enter_fullscreen) { 4193 bool enter_fullscreen) {
4198 fullscreen_controller_->ToggleFullscreenModeForTab(tab, enter_fullscreen); 4194 fullscreen_controller_->ToggleFullscreenModeForTab(tab, enter_fullscreen);
4199 } 4195 }
4200 4196
4201 bool Browser::IsFullscreenForTabOrPending(const WebContents* tab) const { 4197 bool Browser::IsFullscreenForTab(const WebContents* tab) const {
4202 return fullscreen_controller_->IsFullscreenForTabOrPending(tab); 4198 return fullscreen_controller_->IsFullscreenForTabOrPending(tab);
4203 } 4199 }
4204 4200
4205 void Browser::JSOutOfMemory(WebContents* tab) { 4201 void Browser::JSOutOfMemory(WebContents* tab) {
4206 JSOutOfMemoryHelper(tab); 4202 JSOutOfMemoryHelper(tab);
4207 } 4203 }
4208 4204
4209 void Browser::RegisterProtocolHandler(WebContents* tab, 4205 void Browser::RegisterProtocolHandler(WebContents* tab,
4210 const std::string& protocol, 4206 const std::string& protocol,
4211 const GURL& url, 4207 const GURL& url,
(...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after
5676 } else { 5672 } else {
5677 LoginUIServiceFactory::GetForProfile( 5673 LoginUIServiceFactory::GetForProfile(
5678 profile()->GetOriginalProfile())->ShowLoginUI(false); 5674 profile()->GetOriginalProfile())->ShowLoginUI(false);
5679 } 5675 }
5680 #endif 5676 #endif
5681 } 5677 }
5682 5678
5683 void Browser::ToggleSpeechInput() { 5679 void Browser::ToggleSpeechInput() {
5684 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5680 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5685 } 5681 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698