Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 // defined(OS_WIN) | 10 #endif // defined(OS_WIN) |
| (...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2070 UpdateMap::iterator i = scheduled_updates_.find(contents); | 2070 UpdateMap::iterator i = scheduled_updates_.find(contents); |
| 2071 if (i != scheduled_updates_.end()) | 2071 if (i != scheduled_updates_.end()) |
| 2072 scheduled_updates_.erase(i); | 2072 scheduled_updates_.erase(i); |
| 2073 } | 2073 } |
| 2074 | 2074 |
| 2075 | 2075 |
| 2076 /////////////////////////////////////////////////////////////////////////////// | 2076 /////////////////////////////////////////////////////////////////////////////// |
| 2077 // Browser, Getters for UI (private): | 2077 // Browser, Getters for UI (private): |
| 2078 | 2078 |
| 2079 StatusBubble* Browser::GetStatusBubble() { | 2079 StatusBubble* Browser::GetStatusBubble() { |
| 2080 // In kiosk mode, we want to always hide the status bubble. | 2080 // In kiosk and exclusive app mode, we want to always hide the status bubble. |
| 2081 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) | 2081 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 2082 bool app_mode = command_line->HasSwitch(switches::kKioskMode) || | |
| 2083 (command_line->HasSwitch(switches::kForceAppMode) && | |
| 2084 command_line->HasSwitch(switches::kAppId)); | |
|
Mr4D (OOO till 08-26)
2013/01/30 00:55:00
You could use that here as well.
zel
2013/01/30 03:03:44
Done.
| |
| 2085 if (app_mode) | |
| 2082 return NULL; | 2086 return NULL; |
| 2083 return window_ ? window_->GetStatusBubble() : NULL; | 2087 return window_ ? window_->GetStatusBubble() : NULL; |
| 2084 } | 2088 } |
| 2085 | 2089 |
| 2086 /////////////////////////////////////////////////////////////////////////////// | 2090 /////////////////////////////////////////////////////////////////////////////// |
| 2087 // Browser, Session restore functions (private): | 2091 // Browser, Session restore functions (private): |
| 2088 | 2092 |
| 2089 void Browser::SyncHistoryWithTabs(int index) { | 2093 void Browser::SyncHistoryWithTabs(int index) { |
| 2090 SessionService* session_service = | 2094 SessionService* session_service = |
| 2091 SessionServiceFactory::GetForProfileIfExisting(profile()); | 2095 SessionServiceFactory::GetForProfileIfExisting(profile()); |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2338 if (contents && !allow_js_access) { | 2342 if (contents && !allow_js_access) { |
| 2339 contents->web_contents()->GetController().LoadURL( | 2343 contents->web_contents()->GetController().LoadURL( |
| 2340 target_url, | 2344 target_url, |
| 2341 content::Referrer(), | 2345 content::Referrer(), |
| 2342 content::PAGE_TRANSITION_LINK, | 2346 content::PAGE_TRANSITION_LINK, |
| 2343 std::string()); // No extra headers. | 2347 std::string()); // No extra headers. |
| 2344 } | 2348 } |
| 2345 | 2349 |
| 2346 return contents != NULL; | 2350 return contents != NULL; |
| 2347 } | 2351 } |
| OLD | NEW |