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

Side by Side Diff: chrome/browser/google/google_util_chromeos.cc

Issue 22031003: Rename BrowserThread::IsWellKnownThread to IsThreadInitialized. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Minor comment reword. Created 7 years, 4 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
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 28 matching lines...) Expand all
39 g_browser_process->local_state()->SetString(prefs::kRLZBrand, brand); 39 g_browser_process->local_state()->SetString(prefs::kRLZBrand, brand);
40 callback.Run(); 40 callback.Run();
41 } 41 }
42 42
43 // True if brand code has been cleared for the current session. 43 // True if brand code has been cleared for the current session.
44 bool g_brand_empty = false; 44 bool g_brand_empty = false;
45 45
46 } // namespace 46 } // namespace
47 47
48 void ClearBrandForCurrentSession() { 48 void ClearBrandForCurrentSession() {
49 DCHECK( 49 DCHECK(!content::BrowserThread::IsThreadInitialized(
50 !content::BrowserThread::IsWellKnownThread(content::BrowserThread::UI) || 50 content::BrowserThread::UI) ||
51 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 51 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
52 g_brand_empty = true; 52 g_brand_empty = true;
53 } 53 }
54 54
55 std::string GetBrand() { 55 std::string GetBrand() {
56 DCHECK( 56 DCHECK(!content::BrowserThread::IsThreadInitialized(
57 !content::BrowserThread::IsWellKnownThread(content::BrowserThread::UI) || 57 content::BrowserThread::UI) ||
58 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 58 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
59 if (g_brand_empty) 59 if (g_brand_empty)
60 return std::string(); 60 return std::string();
61 DCHECK(g_browser_process->local_state()); 61 DCHECK(g_browser_process->local_state());
62 return g_browser_process->local_state()->GetString(prefs::kRLZBrand); 62 return g_browser_process->local_state()->GetString(prefs::kRLZBrand);
63 } 63 }
64 64
65 void SetBrandFromFile(const base::Closure& callback) { 65 void SetBrandFromFile(const base::Closure& callback) {
66 base::PostTaskAndReplyWithResult( 66 base::PostTaskAndReplyWithResult(
67 base::WorkerPool::GetTaskRunner(false /* task_is_slow */).get(), 67 base::WorkerPool::GetTaskRunner(false /* task_is_slow */).get(),
68 FROM_HERE, 68 FROM_HERE,
69 base::Bind(&ReadBrandFromFile), 69 base::Bind(&ReadBrandFromFile),
70 base::Bind(&SetBrand, callback)); 70 base::Bind(&SetBrand, callback));
71 } 71 }
72 72
73 } // namespace chromeos 73 } // namespace chromeos
74 } // namespace google_util 74 } // namespace google_util
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698