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

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

Issue 2510803003: Pass RapporService to content/browser/ (Closed)
Patch Set: Add a test for the current url API Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | content/browser/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_UI_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // Set indicator that this browser is being created via session restore. 227 // Set indicator that this browser is being created via session restore.
228 // This is used on the Mac (only) to determine animation style when the 228 // This is used on the Mac (only) to determine animation style when the
229 // browser window is shown. 229 // browser window is shown.
230 void set_is_session_restore(bool is_session_restore) { 230 void set_is_session_restore(bool is_session_restore) {
231 is_session_restore_ = is_session_restore; 231 is_session_restore_ = is_session_restore;
232 } 232 }
233 bool is_session_restore() const { 233 bool is_session_restore() const {
234 return is_session_restore_; 234 return is_session_restore_;
235 } 235 }
236 236
237 ::rappor::RapporService* getRapporService() override;
Charlie Reis 2016/11/16 23:55:21 Is there a reason this is listed in the "Construct
Navid Zolghadr 2016/12/01 18:27:15 I removed the changes to this file as per Nick's s
238
237 // Accessors //////////////////////////////////////////////////////////////// 239 // Accessors ////////////////////////////////////////////////////////////////
238 240
239 Type type() const { return type_; } 241 Type type() const { return type_; }
240 const std::string& app_name() const { return app_name_; } 242 const std::string& app_name() const { return app_name_; }
241 bool is_trusted_source() const { return is_trusted_source_; } 243 bool is_trusted_source() const { return is_trusted_source_; }
242 Profile* profile() const { return profile_; } 244 Profile* profile() const { return profile_; }
243 gfx::Rect override_bounds() const { return override_bounds_; } 245 gfx::Rect override_bounds() const { return override_bounds_; }
244 const std::string& initial_workspace() const { return initial_workspace_; } 246 const std::string& initial_workspace() const { return initial_workspace_; }
245 247
246 // |window()| will return NULL if called before |CreateBrowserWindow()| 248 // |window()| will return NULL if called before |CreateBrowserWindow()|
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 // The following factory is used for chrome update coalescing. 1013 // The following factory is used for chrome update coalescing.
1012 base::WeakPtrFactory<Browser> chrome_updater_factory_; 1014 base::WeakPtrFactory<Browser> chrome_updater_factory_;
1013 1015
1014 // The following factory is used to close the frame at a later time. 1016 // The following factory is used to close the frame at a later time.
1015 base::WeakPtrFactory<Browser> weak_factory_; 1017 base::WeakPtrFactory<Browser> weak_factory_;
1016 1018
1017 DISALLOW_COPY_AND_ASSIGN(Browser); 1019 DISALLOW_COPY_AND_ASSIGN(Browser);
1018 }; 1020 };
1019 1021
1020 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1022 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | content/browser/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698