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

Side by Side Diff: chrome/browser/browser.h

Issue 176018: Merge 24736 - Change default homepage experience.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 3 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 | « no previous file | chrome/browser/browser.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
Merged /trunk/src/chrome/browser/browser.h:r24736
Merged /branches/chrome_webkit_merge_branch/chrome/browser/browser.h:r69-2775
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 #ifndef CHROME_BROWSER_BROWSER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_H_
6 #define CHROME_BROWSER_BROWSER_H_ 6 #define CHROME_BROWSER_BROWSER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 void OpenAboutChromeDialog(); 372 void OpenAboutChromeDialog();
373 void OpenHelpTab(); 373 void OpenHelpTab();
374 #if defined(OS_CHROMEOS) 374 #if defined(OS_CHROMEOS)
375 void ShowControlPanel(); 375 void ShowControlPanel();
376 #endif 376 #endif
377 377
378 virtual void UpdateDownloadShelfVisibility(bool visible); 378 virtual void UpdateDownloadShelfVisibility(bool visible);
379 379
380 ///////////////////////////////////////////////////////////////////////////// 380 /////////////////////////////////////////////////////////////////////////////
381 381
382 // Sets the value of homepage related prefs to new values. Since we do not
383 // want to change these values for existing users, we can not change the
384 // default values under RegisterUserPrefs. This method gets called during
385 // First Run.
386 static void SetNewHomePagePrefs(PrefService* prefs);
387
382 static void RegisterPrefs(PrefService* prefs); 388 static void RegisterPrefs(PrefService* prefs);
383 static void RegisterUserPrefs(PrefService* prefs); 389 static void RegisterUserPrefs(PrefService* prefs);
384 390
385 // Returns the Browser which contains the tab with the given 391 // Returns the Browser which contains the tab with the given
386 // NavigationController, also filling in |index| (if valid) with the tab's 392 // NavigationController, also filling in |index| (if valid) with the tab's
387 // index in the tab strip. 393 // index in the tab strip.
388 // Returns NULL if not found. 394 // Returns NULL if not found.
389 // This call is O(N) in the number of tabs. 395 // This call is O(N) in the number of tabs.
390 static Browser* GetBrowserForController( 396 static Browser* GetBrowserForController(
391 const NavigationController* controller, int* index); 397 const NavigationController* controller, int* index);
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 // The browser idle task helps cleanup unused memory resources when idle. 767 // The browser idle task helps cleanup unused memory resources when idle.
762 scoped_ptr<BrowserIdleTimer> idle_task_; 768 scoped_ptr<BrowserIdleTimer> idle_task_;
763 769
764 // Keep track of the encoding auto detect pref. 770 // Keep track of the encoding auto detect pref.
765 BooleanPrefMember encoding_auto_detect_; 771 BooleanPrefMember encoding_auto_detect_;
766 772
767 DISALLOW_COPY_AND_ASSIGN(Browser); 773 DISALLOW_COPY_AND_ASSIGN(Browser);
768 }; 774 };
769 775
770 #endif // CHROME_BROWSER_BROWSER_H_ 776 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698